diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index be23099dca8a9c136e976f5d69b64dca31711f49..47769e0870e841abad4fbc1d0fcc7bba6b7a2822 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -176,10 +176,7 @@ public class Lexer
{
case 0:
{
- Token token = new TPkgId(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TPkgId(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -191,9 +188,7 @@ public class Lexer
}
case 1:
{
- Token token = new TPackage(
- startLine + 1,
- startPos + 1);
+ Token token = new TPackage(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -205,9 +200,7 @@ public class Lexer
}
case 2:
{
- Token token = new TStates(
- startLine + 1,
- startPos + 1);
+ Token token = new TStates(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -215,9 +208,7 @@ public class Lexer
}
case 3:
{
- Token token = new THelpers(
- startLine + 1,
- startPos + 1);
+ Token token = new THelpers(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -225,9 +216,7 @@ public class Lexer
}
case 4:
{
- Token token = new TTokens(
- startLine + 1,
- startPos + 1);
+ Token token = new TTokens(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -235,9 +224,7 @@ public class Lexer
}
case 5:
{
- Token token = new TIgnored(
- startLine + 1,
- startPos + 1);
+ Token token = new TIgnored(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -245,9 +232,7 @@ public class Lexer
}
case 6:
{
- Token token = new TProductions(
- startLine + 1,
- startPos + 1);
+ Token token = new TProductions(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -255,9 +240,7 @@ public class Lexer
}
case 7:
{
- Token token = new TAbstract(
- startLine + 1,
- startPos + 1);
+ Token token = new TAbstract(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -265,9 +248,7 @@ public class Lexer
}
case 8:
{
- Token token = new TSyntax(
- startLine + 1,
- startPos + 1);
+ Token token = new TSyntax(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -275,9 +256,7 @@ public class Lexer
}
case 9:
{
- Token token = new TTree(
- startLine + 1,
- startPos + 1);
+ Token token = new TTree(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -285,9 +264,7 @@ public class Lexer
}
case 10:
{
- Token token = new TNew(
- startLine + 1,
- startPos + 1);
+ Token token = new TNew(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -295,9 +272,7 @@ public class Lexer
}
case 11:
{
- Token token = new TNull(
- startLine + 1,
- startPos + 1);
+ Token token = new TNull(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -305,9 +280,7 @@ public class Lexer
}
case 12:
{
- Token token = new TTokenSpecifier(
- startLine + 1,
- startPos + 1);
+ Token token = new TTokenSpecifier(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -315,9 +288,7 @@ public class Lexer
}
case 13:
{
- Token token = new TProductionSpecifier(
- startLine + 1,
- startPos + 1);
+ Token token = new TProductionSpecifier(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -325,9 +296,7 @@ public class Lexer
}
case 14:
{
- Token token = new TDot(
- startLine + 1,
- startPos + 1);
+ Token token = new TDot(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -335,9 +304,7 @@ public class Lexer
}
case 15:
{
- Token token = new TDDot(
- startLine + 1,
- startPos + 1);
+ Token token = new TDDot(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -345,9 +312,7 @@ public class Lexer
}
case 16:
{
- Token token = new TSemicolon(
- startLine + 1,
- startPos + 1);
+ Token token = new TSemicolon(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -360,9 +325,7 @@ public class Lexer
}
case 17:
{
- Token token = new TEqual(
- startLine + 1,
- startPos + 1);
+ Token token = new TEqual(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -370,9 +333,7 @@ public class Lexer
}
case 18:
{
- Token token = new TLBkt(
- startLine + 1,
- startPos + 1);
+ Token token = new TLBkt(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -380,9 +341,7 @@ public class Lexer
}
case 19:
{
- Token token = new TRBkt(
- startLine + 1,
- startPos + 1);
+ Token token = new TRBkt(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -390,9 +349,7 @@ public class Lexer
}
case 20:
{
- Token token = new TLPar(
- startLine + 1,
- startPos + 1);
+ Token token = new TLPar(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -400,9 +357,7 @@ public class Lexer
}
case 21:
{
- Token token = new TRPar(
- startLine + 1,
- startPos + 1);
+ Token token = new TRPar(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -410,9 +365,7 @@ public class Lexer
}
case 22:
{
- Token token = new TLBrace(
- startLine + 1,
- startPos + 1);
+ Token token = new TLBrace(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -420,9 +373,7 @@ public class Lexer
}
case 23:
{
- Token token = new TRBrace(
- startLine + 1,
- startPos + 1);
+ Token token = new TRBrace(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -430,9 +381,7 @@ public class Lexer
}
case 24:
{
- Token token = new TPlus(
- startLine + 1,
- startPos + 1);
+ Token token = new TPlus(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -440,9 +389,7 @@ public class Lexer
}
case 25:
{
- Token token = new TMinus(
- startLine + 1,
- startPos + 1);
+ Token token = new TMinus(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -450,9 +397,7 @@ public class Lexer
}
case 26:
{
- Token token = new TQMark(
- startLine + 1,
- startPos + 1);
+ Token token = new TQMark(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -460,9 +405,7 @@ public class Lexer
}
case 27:
{
- Token token = new TStar(
- startLine + 1,
- startPos + 1);
+ Token token = new TStar(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -470,9 +413,7 @@ public class Lexer
}
case 28:
{
- Token token = new TBar(
- startLine + 1,
- startPos + 1);
+ Token token = new TBar(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -480,9 +421,7 @@ public class Lexer
}
case 29:
{
- Token token = new TComma(
- startLine + 1,
- startPos + 1);
+ Token token = new TComma(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -490,9 +429,7 @@ public class Lexer
}
case 30:
{
- Token token = new TSlash(
- startLine + 1,
- startPos + 1);
+ Token token = new TSlash(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -500,9 +437,7 @@ public class Lexer
}
case 31:
{
- Token token = new TArrow(
- startLine + 1,
- startPos + 1);
+ Token token = new TArrow(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -510,9 +445,7 @@ public class Lexer
}
case 32:
{
- Token token = new TColon(
- startLine + 1,
- startPos + 1);
+ Token token = new TColon(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -520,10 +453,7 @@ public class Lexer
}
case 33:
{
- Token token = new TId(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TId(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -531,10 +461,7 @@ public class Lexer
}
case 34:
{
- Token token = new TChar(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TChar(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -542,10 +469,7 @@ public class Lexer
}
case 35:
{
- Token token = new TDecChar(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TDecChar(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -553,10 +477,7 @@ public class Lexer
}
case 36:
{
- Token token = new THexChar(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new THexChar(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -564,10 +485,7 @@ public class Lexer
}
case 37:
{
- Token token = new TString(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TString(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -575,10 +493,7 @@ public class Lexer
}
case 38:
{
- Token token = new TBlank(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TBlank(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -586,10 +501,7 @@ public class Lexer
}
case 39:
{
- Token token = new TComment(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new TComment(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -601,14 +513,10 @@ public class Lexer
{
if(this.text.length() > 0)
{
- throw new LexerException(
- "[" + (startLine + 1) + "," + (startPos + 1) + "]" +
- " Unknown token: " + this.text);
+ throw new LexerException("[" + (startLine + 1) + "," + (startPos + 1) + "] Unknown token: " + this.text);
}
- EOF token = new EOF(
- startLine + 1,
- startPos + 1);
+ EOF token = new EOF(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 36a817511e4bb7c0a5ebabd110da943abe02f478..c082f57f038845d7c0a589dbed2e2912f922210e 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -204,10 +204,7 @@ $
Macro:LexerVariableToken
case $0$:
{
- Token token = new $1$(
- getText(acceptLength),
- startLine + 1,
- startPos + 1);
+ Token token = new $1$(getText(acceptLength), startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -217,9 +214,7 @@ $
Macro:LexerFixedToken
case $0$:
{
- Token token = new $1$(
- startLine + 1,
- startPos + 1);
+ Token token = new $1$(startLine + 1, startPos + 1);
pushBack(acceptLength);
this.pos = acceptPos;
this.line = acceptLine;
@@ -255,14 +250,10 @@ Macro:LexerBody
{
if(this.text.length() > 0)
{
- throw new LexerException(
- "[" + (startLine + 1) + "," + (startPos + 1) + "]" +
- " Unknown token: " + this.text);
+ throw new LexerException("[" + (startLine + 1) + "," + (startPos + 1) + "] Unknown token: " + this.text);
}
- EOF token = new EOF(
- startLine + 1,
- startPos + 1);
+ EOF token = new EOF(startLine + 1, startPos + 1);
return token;
}
}