Save/restore the ANTLR RustLexer specific internals. (apache#5624)

* Save/restore the ANTLR RustLexer specific internals. * Use just the token type in RustLexerBase
pepness · Mar 15, 2023 · d8f5eab · d8f5eab
1 parent ceb24f7
commit d8f5eab
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
@@ -21,7 +21,6 @@
 import java.util.BitSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Parser;
@@ -75,7 +74,7 @@ public void reportContextSensitivity(Parser parser, DFA dfa, int line, int charP
 
     }
 
-    private static final RustLexer createLexer(CharStream input) {
+    private static RustLexer createLexer(CharStream input) {
         RustLexer lexer = new RustLexer(input);
         lexer.removeErrorListeners();
         lexer.addErrorListener(new RustLanguageLexerErrorListener());
@@ -91,4 +90,28 @@ protected Token<RustTokenID> mapToken(org.antlr.v4.runtime.Token antlrToken) {
         return token(RustTokenID.from(antlrToken));
     }
 
+    @Override
+    public Object state() {
+        return new LexerState(lexer);
+    }
+
+    private static final class LexerState extends AbstractAntlrLexerBridge.LexerState<RustLexer> {
+        final Integer lt1;
+        final Integer lt2;
+
+        LexerState(RustLexer lexer) {
+            super(lexer);
+
+            this.lt1 = lexer.lt1;
+            this.lt2 = lexer.lt2;
+        }
+
+        @Override
+        public void restore(RustLexer lexer) {
+            super.restore(lexer);
+
+            lexer.lt1 = lt1;
+            lexer.lt2 = lt2;
+        }
+    }
 }
diff --git a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
@@ -54,8 +54,8 @@ public RustLexerBase(CharStream input) {
         super(input);
     }
 
-    Token lt1;
-    Token lt2;
+    public Integer lt1;
+    public Integer lt2;
 
     @Override
     public Token nextToken() {
@@ -85,7 +85,7 @@ public Token nextToken() {
         if (next.getChannel() == Token.DEFAULT_CHANNEL) {
             // Keep track of the last token on the default channel.
             this.lt2 = this.lt1;
-            this.lt1 = next;
+            this.lt1 = next.getType();
         }
 
         return next;
@@ -130,10 +130,10 @@ public boolean floatLiteralPossible() {
         if (this.lt1 == null || this.lt2 == null) {
             return true;
         }
-        if (this.lt1.getType() != RustLexer.DOT) {
+        if (this.lt1 != RustLexer.DOT) {
             return true;
         }
-        switch (this.lt2.getType()) {
+        switch (this.lt2) {
             case RustLexer.CHAR_LITERAL:
             case RustLexer.STRING_LITERAL:
             case RustLexer.RAW_STRING_LITERAL: