diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 30d4aa08edd6cf929936c40da9e661b84750e377..be23099dca8a9c136e976f5d69b64dca31711f49 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -56,16 +56,16 @@ public class Lexer
protected Token getToken() throws IOException, LexerException
{
- int dfa_state = 0;
+ int dfaState = 0;
- int start_pos = this.pos;
- int start_line = this.line;
+ int startPos = this.pos;
+ int startLine = this.line;
- int accept_state = -1;
- int accept_token = -1;
- int accept_length = -1;
- int accept_pos = -1;
- int accept_line = -1;
+ int acceptState = -1;
+ int acceptToken = -1;
+ int acceptLength = -1;
+ int acceptPos = -1;
+ int acceptLine = -1;
int[][][] gotoTable = Lexer.gotoTable[this.state.ordinal()];
int[] accept = Lexer.accept[this.state.ordinal()];
@@ -121,9 +121,9 @@ public class Lexer
do
{
- int oldState = (dfa_state < -1) ? (-2 -dfa_state) : dfa_state;
+ int oldState = (dfaState < -1) ? (-2 -dfaState) : dfaState;
- dfa_state = -1;
+ dfaState = -1;
int[][] tmp1 = gotoTable[oldState];
int low = 0;
@@ -146,43 +146,43 @@ public class Lexer
}
else
{
- dfa_state = tmp2[2];
+ dfaState = tmp2[2];
break;
}
}
- } while(dfa_state < -1);
+ } while(dfaState < -1);
}
else
{
- dfa_state = -1;
+ dfaState = -1;
}
- if(dfa_state >= 0)
+ if(dfaState >= 0)
{
- if(accept[dfa_state] != -1)
+ if(accept[dfaState] != -1)
{
- accept_state = dfa_state;
- accept_token = accept[dfa_state];
- accept_length = this.text.length();
- accept_pos = this.pos;
- accept_line = this.line;
+ acceptState = dfaState;
+ acceptToken = accept[dfaState];
+ acceptLength = this.text.length();
+ acceptPos = this.pos;
+ acceptLine = this.line;
}
}
else
{
- if(accept_state != -1)
+ if(acceptState != -1)
{
- switch(accept_token)
+ switch(acceptToken)
{
case 0:
{
Token token = new TPkgId(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
switch(state.ordinal())
{
case 1: state = State.PACKAGE; break;
@@ -192,11 +192,11 @@ public class Lexer
case 1:
{
Token token = new TPackage(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
switch(state.ordinal())
{
case 0: state = State.PACKAGE; break;
@@ -206,151 +206,151 @@ public class Lexer
case 2:
{
Token token = new TStates(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 3:
{
Token token = new THelpers(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 4:
{
Token token = new TTokens(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 5:
{
Token token = new TIgnored(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 6:
{
Token token = new TProductions(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 7:
{
Token token = new TAbstract(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 8:
{
Token token = new TSyntax(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 9:
{
Token token = new TTree(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 10:
{
Token token = new TNew(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 11:
{
Token token = new TNull(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 12:
{
Token token = new TTokenSpecifier(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 13:
{
Token token = new TProductionSpecifier(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 14:
{
Token token = new TDot(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 15:
{
Token token = new TDDot(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 16:
{
Token token = new TSemicolon(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
switch(state.ordinal())
{
case 0: state = State.NORMAL; break;
@@ -361,238 +361,238 @@ public class Lexer
case 17:
{
Token token = new TEqual(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 18:
{
Token token = new TLBkt(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 19:
{
Token token = new TRBkt(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 20:
{
Token token = new TLPar(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 21:
{
Token token = new TRPar(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 22:
{
Token token = new TLBrace(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 23:
{
Token token = new TRBrace(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 24:
{
Token token = new TPlus(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 25:
{
Token token = new TMinus(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 26:
{
Token token = new TQMark(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 27:
{
Token token = new TStar(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 28:
{
Token token = new TBar(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 29:
{
Token token = new TComma(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 30:
{
Token token = new TSlash(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 31:
{
Token token = new TArrow(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 32:
{
Token token = new TColon(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 33:
{
Token token = new TId(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 34:
{
Token token = new TChar(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 35:
{
Token token = new TDecChar(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 36:
{
Token token = new THexChar(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 37:
{
Token token = new TString(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 38:
{
Token token = new TBlank(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
case 39:
{
Token token = new TComment(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
return token;
}
}
@@ -602,13 +602,13 @@ public class Lexer
if(this.text.length() > 0)
{
throw new LexerException(
- "[" + (start_line + 1) + "," + (start_pos + 1) + "]" +
+ "[" + (startLine + 1) + "," + (startPos + 1) + "]" +
" Unknown token: " + this.text);
}
EOF token = new EOF(
- start_line + 1,
- start_pos + 1);
+ startLine + 1,
+ startPos + 1);
return token;
}
}
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index 506e87f389c5e4f871be9f88c31545462e96357d..36a817511e4bb7c0a5ebabd110da943abe02f478 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -80,16 +80,16 @@ public class Lexer
protected Token getToken() throws IOException, LexerException
{
- int dfa_state = 0;
+ int dfaState = 0;
- int start_pos = this.pos;
- int start_line = this.line;
+ int startPos = this.pos;
+ int startLine = this.line;
- int accept_state = -1;
- int accept_token = -1;
- int accept_length = -1;
- int accept_pos = -1;
- int accept_line = -1;
+ int acceptState = -1;
+ int acceptToken = -1;
+ int acceptLength = -1;
+ int acceptPos = -1;
+ int acceptLine = -1;
int[][][] gotoTable = Lexer.gotoTable[this.state.ordinal()];
int[] accept = Lexer.accept[this.state.ordinal()];
@@ -145,9 +145,9 @@ public class Lexer
do
{
- int oldState = (dfa_state < -1) ? (-2 -dfa_state) : dfa_state;
+ int oldState = (dfaState < -1) ? (-2 -dfaState) : dfaState;
- dfa_state = -1;
+ dfaState = -1;
int[][] tmp1 = gotoTable[oldState];
int low = 0;
@@ -170,33 +170,33 @@ public class Lexer
}
else
{
- dfa_state = tmp2[2];
+ dfaState = tmp2[2];
break;
}
}
- } while(dfa_state < -1);
+ } while(dfaState < -1);
}
else
{
- dfa_state = -1;
+ dfaState = -1;
}
- if(dfa_state >= 0)
+ if(dfaState >= 0)
{
- if(accept[dfa_state] != -1)
+ if(accept[dfaState] != -1)
{
- accept_state = dfa_state;
- accept_token = accept[dfa_state];
- accept_length = this.text.length();
- accept_pos = this.pos;
- accept_line = this.line;
+ acceptState = dfaState;
+ acceptToken = accept[dfaState];
+ acceptLength = this.text.length();
+ acceptPos = this.pos;
+ acceptLine = this.line;
}
}
else
{
- if(accept_state != -1)
+ if(acceptState != -1)
{
- switch(accept_token)
+ switch(acceptToken)
{
$
@@ -205,12 +205,12 @@ Macro:LexerVariableToken
case $0$:
{
Token token = new $1$(
- getText(accept_length),
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ getText(acceptLength),
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
$
@@ -218,11 +218,11 @@ Macro:LexerFixedToken
case $0$:
{
Token token = new $1$(
- start_line + 1,
- start_pos + 1);
- pushBack(accept_length);
- this.pos = accept_pos;
- this.line = accept_line;
+ startLine + 1,
+ startPos + 1);
+ pushBack(acceptLength);
+ this.pos = acceptPos;
+ this.line = acceptLine;
$
@@ -256,13 +256,13 @@ Macro:LexerBody
if(this.text.length() > 0)
{
throw new LexerException(
- "[" + (start_line + 1) + "," + (start_pos + 1) + "]" +
+ "[" + (startLine + 1) + "," + (startPos + 1) + "]" +
" Unknown token: " + this.text);
}
EOF token = new EOF(
- start_line + 1,
- start_pos + 1);
+ startLine + 1,
+ startPos + 1);
return token;
}
}