From 2da55e01c39e666ac025331baaa97ed5912375a2 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Fri, 10 May 2024 16:55:09 +0200
Subject: [PATCH] Remove unneeded acceptState variable from generated
Lexer.getToken
Its value was never really used - the code only ever checked if it is -1
(its initial value) or not. The existing acceptToken variable can
fulfill the same purpose - it's also initially -1 and set to a different
value at the same time as acceptState.
---
src/main/java/org/sablecc/sablecc/lexer/Lexer.java | 4 +---
src/main/resources/org/sablecc/sablecc/lexer.txt | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 16c2a23..2e4873e 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -61,7 +61,6 @@ public class Lexer
int startPos = this.pos;
int startLine = this.line;
- int acceptState = -1;
int acceptToken = -1;
int acceptLength = -1;
int acceptPos = -1;
@@ -162,7 +161,6 @@ public class Lexer
{
if(acceptSub[dfaState] != -1)
{
- acceptState = dfaState;
acceptToken = acceptSub[dfaState];
acceptLength = this.text.length();
acceptPos = this.pos;
@@ -172,7 +170,7 @@ public class Lexer
}
else
{
- if(acceptState != -1)
+ if(acceptToken != -1)
{
Token tok;
switch(acceptToken)
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index 3d482aa..4e552fa 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -85,7 +85,6 @@ public class Lexer
int startPos = this.pos;
int startLine = this.line;
- int acceptState = -1;
int acceptToken = -1;
int acceptLength = -1;
int acceptPos = -1;
@@ -186,7 +185,6 @@ public class Lexer
{
if(acceptSub[dfaState] != -1)
{
- acceptState = dfaState;
acceptToken = acceptSub[dfaState];
acceptLength = this.text.length();
acceptPos = this.pos;
@@ -196,7 +194,7 @@ public class Lexer
}
else
{
- if(acceptState != -1)
+ if(acceptToken != -1)
{
Token tok;
switch(acceptToken)
--
GitLab