From d3abf7823397cd243a6a994414d6016a2c4655d4 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 20 Apr 2022 14:39:01 +0200
Subject: [PATCH] Remove unneeded duplicate fields from Lexer and Parser
 templates

---
 src/main/java/org/sablecc/sablecc/lexer/Lexer.java   | 3 ---
 src/main/java/org/sablecc/sablecc/parser/Parser.java | 8 +++-----
 src/main/resources/org/sablecc/sablecc/lexer.txt     | 3 ---
 src/main/resources/org/sablecc/sablecc/parser.txt    | 8 +++-----
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 53b3a2e..70367f6 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -24,8 +24,6 @@ public class Lexer implements ITokenListContainer
     private List<IToken> tokenList;
     private final Queue<IToken> nextList = new LinkedBlockingQueue<IToken>();
 
-    private IToken tok;
-
     public Queue<IToken> getNextList() {
         return nextList;
     }
@@ -36,7 +34,6 @@ public class Lexer implements ITokenListContainer
     }
 
     private void setToken(Token t) {
-        tok = t;
         token = t;
     }
 
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index 095a3c4..0637415 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -33,12 +33,10 @@ public class Parser implements IParser
 
     protected ArrayList firstPopped = null;
     protected ArrayList lastPopped = null;
-    private ITokenListContainer lex;
 
     public Parser(Lexer lexer)
     {
         this.lexer = lexer;
-        this.lex = lexer;
     }
 
 
@@ -151,7 +149,7 @@ public class Parser implements IParser
     }
 
     protected int findIndex(final IToken token) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
 
         for (int i = list.size() - 1; i >= 0; i--) {
             if (list.get(i) == token) {
@@ -163,13 +161,13 @@ public class Parser implements IParser
     }
 
     protected SourcePosition createBeginPos(final int index) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
         final IToken token = list.get(index);
         return new SourcePosition(token.getLine(), token.getPos());
     }
 
     protected SourcePosition createEndPos(final int index) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
         final IToken token = list.get(index);
         return new SourcePosition(token.getLine(), token.getPos()
             + token.getText().length());
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index b5aab38..9445a1d 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -48,8 +48,6 @@ public class Lexer implements ITokenListContainer
     private List<IToken> tokenList;
     private final Queue<IToken> nextList = new LinkedBlockingQueue<IToken>();
 
-    private IToken tok;
-
     public Queue<IToken> getNextList() {
         return nextList;
     }
@@ -60,7 +58,6 @@ public class Lexer implements ITokenListContainer
     }
 
     private void setToken(Token t) {
-        tok = t;
         token = t;
     }
 
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index 744e30f..6ce4fd8 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -41,12 +41,10 @@ public class Parser implements IParser
 
     protected ArrayList firstPopped = null;
     protected ArrayList lastPopped = null;
-    private ITokenListContainer lex;
 
     public Parser(Lexer lexer)
     {
         this.lexer = lexer;
-        this.lex = lexer;
     }
 
 
@@ -159,7 +157,7 @@ public class Parser implements IParser
     }
 
     protected int findIndex(final IToken token) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
 
         for (int i = list.size() - 1; i >= 0; i--) {
             if (list.get(i) == token) {
@@ -171,13 +169,13 @@ public class Parser implements IParser
     }
 
     protected SourcePosition createBeginPos(final int index) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
         final IToken token = list.get(index);
         return new SourcePosition(token.getLine(), token.getPos());
     }
 
     protected SourcePosition createEndPos(final int index) {
-        final List<IToken> list = this.lex.getTokenList();
+        final List<IToken> list = this.lexer.getTokenList();
         final IToken token = list.get(index);
         return new SourcePosition(token.getLine(), token.getPos()
             + token.getText().length());
-- 
GitLab