Bug 1467336 - Remove GeneralTokenStreamChars::{,un}getChar now that they're unused. r=arai

--HG--
extra : rebase_source : 908ffc7370dafe00bb6266ec5817b40bb353d93f

js/src/frontend/TokenStream.cpp

@@ -589,28 +589,6 @@ TokenStreamChars<char16_t, AnyCharsAccess>::getNonAsciiCodePoint(int32_t lead, i
     return true;
 }
 
-template<typename CharT, class AnyCharsAccess>
-void
-GeneralTokenStreamChars<CharT, AnyCharsAccess>::ungetChar(int32_t c)
-{
-    if (c == EOF)
-        return;
-
-    sourceUnits.ungetCodeUnit();
-    if (c == '\n') {
-        int32_t c2 = sourceUnits.peekCodeUnit();
-        MOZ_ASSERT(SourceUnits::isRawEOLChar(c2));
-
-        // If it's a \r\n sequence, also unget the \r.
-        if (c2 == CharT('\n') && !sourceUnits.atStart())
-            sourceUnits.ungetOptionalCRBeforeLF();
-
-        anyCharsAccess().undoInternalUpdateLineInfoForEOL();
-    } else {
-        MOZ_ASSERT(sourceUnits.peekCodeUnit() == c);
-    }
-}
-
 template<class AnyCharsAccess>
 void
 TokenStreamChars<char16_t, AnyCharsAccess>::ungetCodePointIgnoreEOL(uint32_t codePoint)

js/src/frontend/TokenStream.h

@@ -1326,8 +1326,6 @@ class GeneralTokenStreamChars
         CharsBase::ungetCodeUnit(c);
     }
 
-    void ungetChar(int32_t c);
-
     /**
      * Consume characters til EOL/EOF following the start of a single-line
      * comment, without consuming the EOL/EOF.
@@ -1376,12 +1374,6 @@ class TokenStreamChars<char16_t, AnyCharsAccess>
     // |*c|.  Return false and leave |*c| undefined on failure.
     MOZ_MUST_USE bool getCodePoint(int32_t* cp);
 
-    // A deprecated alias for |getCodePoint|: most code using this is being
-    // replaced with different approaches.
-    MOZ_MUST_USE bool getChar(int32_t* cp) {
-        return getCodePoint(cp);
-    }
-
     /**
      * Given a just-consumed ASCII code unit/point |lead|, consume a full code
      * point or LineTerminatorSequence (normalizing it to '\n') and store it in
@@ -1547,7 +1539,6 @@ class MOZ_STACK_CLASS TokenStreamSpecific
     using GeneralCharsBase::consumeRestOfSingleLineComment;
     using TokenStreamCharsShared::copyCharBufferTo;
     using CharsBase::fillCharBufferWithTemplateStringContents;
-    using SpecializedCharsBase::getChar;
     using SpecializedCharsBase::getCodePoint;
     using GeneralCharsBase::getCodeUnit;
     using SpecializedCharsBase::getFullAsciiCodePoint;
@@ -1563,7 +1554,6 @@ class MOZ_STACK_CLASS TokenStreamSpecific
     using GeneralCharsBase::newSimpleToken;
     using CharsBase::peekCodeUnit;
     using CharsBase::sourceUnits;
-    using GeneralCharsBase::ungetChar;
     using SpecializedCharsBase::ungetCodePointIgnoreEOL;
     using GeneralCharsBase::ungetCodeUnit;
     using SpecializedCharsBase::ungetNonAsciiNormalizedCodePoint;