diff --git a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
index 3f15aaec25d1b14bd6ba3064a971e8da8d55fbe6..6240898d8ab342eb9a4d34ceb2edbab8360fe7d5 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
@@ -10,6 +10,7 @@ public class AnalysisAdapter implements Analysis
     private Hashtable<Node,Object> in;
     private Hashtable<Node,Object> out;
 
+    @Override
     public Object getIn(Node node)
     {
         if(this.in == null)
@@ -20,6 +21,7 @@ public class AnalysisAdapter implements Analysis
         return this.in.get(node);
     }
 
+    @Override
     public void setIn(Node node, Object o)
     {
         if(this.in == null)
@@ -37,6 +39,7 @@ public class AnalysisAdapter implements Analysis
         }
     }
 
+    @Override
     public Object getOut(Node node)
     {
         if(this.out == null)
@@ -47,6 +50,7 @@ public class AnalysisAdapter implements Analysis
         return this.out.get(node);
     }
 
+    @Override
     public void setOut(Node node, Object o)
     {
         if(this.out == null)
@@ -64,436 +68,523 @@ public class AnalysisAdapter implements Analysis
         }
     }
 
+    @Override
     public void caseStart(Start node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAGrammar(AGrammar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAHelpers(AHelpers node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAHelperDef(AHelperDef node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAStates(AStates node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseATokens(ATokens node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseATokenDef(ATokenDef node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAStateList(AStateList node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAStateListTail(AStateListTail node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseATransition(ATransition node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAIgnTokens(AIgnTokens node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseARegExp(ARegExp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAConcat(AConcat node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAUnExp(AUnExp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseACharBasic(ACharBasic node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseASetBasic(ASetBasic node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAStringBasic(AStringBasic node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAIdBasic(AIdBasic node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseARegExpBasic(ARegExpBasic node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseACharChar(ACharChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseADecChar(ADecChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAHexChar(AHexChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAOperationSet(AOperationSet node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAIntervalSet(AIntervalSet node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAStarUnOp(AStarUnOp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAQMarkUnOp(AQMarkUnOp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAPlusUnOp(APlusUnOp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAPlusBinOp(APlusBinOp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAMinusBinOp(AMinusBinOp node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAProductions(AProductions node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAProd(AProd node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAAlt(AAlt node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAAltTransform(AAltTransform node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseANewTerm(ANewTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAListTerm(AListTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseASimpleTerm(ASimpleTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseANullTerm(ANullTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseANewListTerm(ANewListTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseASimpleListTerm(ASimpleListTerm node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAProdName(AProdName node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAElem(AElem node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseATokenSpecifier(ATokenSpecifier node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAProductionSpecifier(AProductionSpecifier node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAAst(AAst node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAAstProd(AAstProd node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseAAstAlt(AAstAlt node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTPkgId(TPkgId node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTPackage(TPackage node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTStates(TStates node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTHelpers(THelpers node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTTokens(TTokens node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTIgnored(TIgnored node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTProductions(TProductions node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTAbstract(TAbstract node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTSyntax(TSyntax node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTTree(TTree node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTNew(TNew node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTNull(TNull node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTTokenSpecifier(TTokenSpecifier node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTProductionSpecifier(TProductionSpecifier node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTDot(TDot node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTDDot(TDDot node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTSemicolon(TSemicolon node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTEqual(TEqual node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTLBkt(TLBkt node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTRBkt(TRBkt node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTLPar(TLPar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTRPar(TRPar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTLBrace(TLBrace node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTRBrace(TRBrace node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTPlus(TPlus node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTMinus(TMinus node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTQMark(TQMark node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTStar(TStar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTBar(TBar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTComma(TComma node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTSlash(TSlash node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTArrow(TArrow node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTColon(TColon node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTId(TId node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTChar(TChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTDecChar(TDecChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTHexChar(THexChar node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTString(TString node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTBlank(TBlank node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseTComment(TComment node)
     {
         defaultCase(node);
     }
 
+    @Override
     public void caseEOF(EOF node)
     {
         defaultCase(node);
diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 524077b392a026c2b5806e7f5f11361cda900cab..3bb6563535dae2dfb0ff791b7cb103bcf840ffe2 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -30,6 +30,7 @@ public class Lexer implements ITokenListContainer
         return nextList;
     }
 
+    @Override
     public List<IToken> getTokenList() {
         return tokenList;
     }
diff --git a/src/main/java/org/sablecc/sablecc/node/AAlt.java b/src/main/java/org/sablecc/sablecc/node/AAlt.java
index 156c428f5b743c98f2784fa9522337958bf984f5..36074e9eb4ea905d6dd91be593c1d68b9d02d737 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAlt.java
@@ -40,6 +40,7 @@ public final class AAlt extends PAlt
             cloneNode(this._altTransform_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAAlt(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
index 81ad162be6e23326bd5455d1cee5fc50c408f3e3..b7974515f20bc9cc1ccd36b06a77b141e83026e4 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
@@ -40,6 +40,7 @@ public final class AAltTransform extends PAltTransform
             cloneNode(this._rBrace_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAAltTransform(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAst.java b/src/main/java/org/sablecc/sablecc/node/AAst.java
index bf3fc1f932da27bf8e70c2cabd298afeadc05c80..8a8a152d3c0bd123077c08e54f2946765beac38c 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAst.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAst.java
@@ -30,6 +30,7 @@ public final class AAst extends PAst
             cloneList(this._prods_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAAst(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
index 21fa526c3edc3325e95ccc7bd81fc8c57e6d6f58..b5d6a320975120a72de38e5cfb8fd411ff9b4b6a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
@@ -35,6 +35,7 @@ public final class AAstAlt extends PAstAlt
             cloneList(this._elems_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAAstAlt(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstProd.java b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
index 470f33dd0cbb135f91113fcb58e481eec40904e9..abf3ed435bdab684e53e04c7e4f358da10b7f3e2 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
@@ -35,6 +35,7 @@ public final class AAstProd extends PAstProd
             cloneList(this._alts_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAAstProd(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
index 82952c061a42b97aecd2c5fb12a87fa10f3c7f86..5c6883139c0c702e345a657238a50099f3ef8a42 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
@@ -29,6 +29,7 @@ public final class ACharBasic extends PBasic
             cloneNode(this._char_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseACharBasic(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharChar.java b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
index f0aabef0254bf92ac886ba082c2c26db02b7cdf3..7128f059166bd31cc5010f662c7831e4851cb95f 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
@@ -29,6 +29,7 @@ public final class ACharChar extends PChar
             cloneNode(this._char_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseACharChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AConcat.java b/src/main/java/org/sablecc/sablecc/node/AConcat.java
index 194b8a8f9c887b21d8f44e88d09be862e7676b03..85bfbb65f40831e98034b3dfdddac980bbb61b7b 100644
--- a/src/main/java/org/sablecc/sablecc/node/AConcat.java
+++ b/src/main/java/org/sablecc/sablecc/node/AConcat.java
@@ -30,6 +30,7 @@ public final class AConcat extends PConcat
             cloneList(this._unExps_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAConcat(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ADecChar.java b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
index fbfed10cfc0bf2f2969540bbd87d2a8824fd8b4e..96acd1570d2fb169c7cf9249a80931004bce481f 100644
--- a/src/main/java/org/sablecc/sablecc/node/ADecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
@@ -29,6 +29,7 @@ public final class ADecChar extends PChar
             cloneNode(this._decChar_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseADecChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AElem.java b/src/main/java/org/sablecc/sablecc/node/AElem.java
index a0442c5d5316122ee24eef99286b6fe9638f6b1f..f926a80a463e7b0826de4a340b9fa7575c1ee0a5 100644
--- a/src/main/java/org/sablecc/sablecc/node/AElem.java
+++ b/src/main/java/org/sablecc/sablecc/node/AElem.java
@@ -44,6 +44,7 @@ public final class AElem extends PElem
             cloneNode(this._unOp_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAElem(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AGrammar.java b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
index 57d4ef78c9e64420cc02fc302bfa9c2b7146eb36..902085873c556ba6b3be154f43185533a558c34b 100644
--- a/src/main/java/org/sablecc/sablecc/node/AGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
@@ -60,6 +60,7 @@ public final class AGrammar extends PGrammar
             cloneNode(this._ast_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAGrammar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
index 103dc8152dd063729ab6cf7fea950fe140cda07f..3b17572babb5e38ad0c825ec9f94df1508d1456c 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
@@ -34,6 +34,7 @@ public final class AHelperDef extends PHelperDef
             cloneNode(this._regExp_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAHelperDef(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelpers.java b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
index d9df2298c554c7ea18972673d3f912970ac62617..5e3e64cfd2e87faf6cca4c76a852c35b3a6c42f9 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
@@ -30,6 +30,7 @@ public final class AHelpers extends PHelpers
             cloneList(this._helperDefs_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAHelpers(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AHexChar.java b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
index b773d9832e7836535739e3ec62fee6c33c55aedb..e78f2f5273e1f416af05a258e92bc4a696e64b41 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
@@ -29,6 +29,7 @@ public final class AHexChar extends PChar
             cloneNode(this._hexChar_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAHexChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
index 2f93b77a0efc8ac7c59fc01201f6e2c6f3c824f8..a1efedfe06ec3ade92782bef2fe98de4ef7a1207 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
@@ -29,6 +29,7 @@ public final class AIdBasic extends PBasic
             cloneNode(this._id_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAIdBasic(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
index f608e6ea9178b21cfdad05d32b0d27d2632b8899..7d51b1c961efba397deffa78ba5420642123824b 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
@@ -30,6 +30,7 @@ public final class AIgnTokens extends PIgnTokens
             cloneList(this._listId_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAIgnTokens(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
index 63bdaedbe12886e662a7afb61144ba3cabc0b596..511af25c5e6a87438b26561a763cfb3f87401371 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
@@ -34,6 +34,7 @@ public final class AIntervalSet extends PSet
             cloneNode(this._right_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAIntervalSet(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AListTerm.java b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
index b2a57d93f959cbd244f4448bfae40d126e28bfc7..cb07db4519c6e6c013f352e3d7367b8a5ef202e7 100644
--- a/src/main/java/org/sablecc/sablecc/node/AListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
@@ -35,6 +35,7 @@ public final class AListTerm extends PTerm
             cloneList(this._listTerms_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAListTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
index 23a88a678a284b7d6e7915132566a94667c9c5ad..85f1ffd502bdc3f5f40e7d855f0d4afcd039d5d1 100644
--- a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
@@ -19,6 +19,7 @@ public final class AMinusBinOp extends PBinOp
         return new AMinusBinOp();
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAMinusBinOp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
index 0a378f8f7c763e8e7824325778013e47af701c0b..a86b9af056f118461d4f52399ad2ca9894fac447 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
@@ -40,6 +40,7 @@ public final class ANewListTerm extends PListTerm
             cloneList(this._params_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseANewListTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
index f71060f6c2a0a2f0b26daf7a3f0420bb7be1f9ba..679130b6c540bbbc22cc0946eab4bd525edc70ac 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
@@ -40,6 +40,7 @@ public final class ANewTerm extends PTerm
             cloneList(this._params_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseANewTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
index ef7b50e44d8dacebbc4caab6b934c40ac507aeb1..14be2892ac275778aa89f7fc2e285c974f18ff62 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
@@ -19,6 +19,7 @@ public final class ANullTerm extends PTerm
         return new ANullTerm();
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseANullTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
index 054fb333e90194ea4894832d396a33b1d1512c7b..342bce5ecd4a9d742bae2b24e58d3ccfb5daa43c 100644
--- a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
@@ -39,6 +39,7 @@ public final class AOperationSet extends PSet
             cloneNode(this._right_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAOperationSet(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
index 4d3c911ba78b4fd5da0e3360de6b52e4e024f929..40372e3218571d787e88e4de67a453d682fa41a4 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
@@ -19,6 +19,7 @@ public final class APlusBinOp extends PBinOp
         return new APlusBinOp();
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAPlusBinOp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
index 893cf30313bb27072994fa353b6b974a7ce5eb73..502f4a397717e4e004be8cde73b78bd0cd80c5b3 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
@@ -29,6 +29,7 @@ public final class APlusUnOp extends PUnOp
             cloneNode(this._plus_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAPlusUnOp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProd.java b/src/main/java/org/sablecc/sablecc/node/AProd.java
index 8dac3579b4cc03bb7557fa935ea65226f47d8129..9c5b4b275ad31d43a94e2cd6d44a841ecad3be41 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProd.java
@@ -45,6 +45,7 @@ public final class AProd extends PProd
             cloneList(this._alts_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAProd(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProdName.java b/src/main/java/org/sablecc/sablecc/node/AProdName.java
index 2c68e0e987fde69361d1f00bbace9d07f807cbbb..053132abd1cbdff4782a888c53a84b7b98708350 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProdName.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProdName.java
@@ -34,6 +34,7 @@ public final class AProdName extends PProdName
             cloneNode(this._prodNameTail_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAProdName(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
index 01a72280e08b89e61cb7174c59d5f74d02242282..fae49db4e704bd623622682532d07c7058f6d2fd 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
@@ -19,6 +19,7 @@ public final class AProductionSpecifier extends PSpecifier
         return new AProductionSpecifier();
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAProductionSpecifier(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductions.java b/src/main/java/org/sablecc/sablecc/node/AProductions.java
index 1704b89ec9d5c99712f4942eea78ad53468952dc..c93fc52b33b27801db847ef40493b62f5f09c269 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductions.java
@@ -30,6 +30,7 @@ public final class AProductions extends PProductions
             cloneList(this._prods_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAProductions(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
index 45c38bdcb7c29f3c4990f66df1c6de46438456d0..6af841a9e90051e9ce74b5b8f4693fbbe58609a8 100644
--- a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
@@ -29,6 +29,7 @@ public final class AQMarkUnOp extends PUnOp
             cloneNode(this._qMark_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAQMarkUnOp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExp.java b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
index 3950ef3782742b0f993ddb4d372df8c51ad23cad..b39ea3b2f7b37e1d94d96b9b4c21b41b1b0f9f39 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
@@ -30,6 +30,7 @@ public final class ARegExp extends PRegExp
             cloneList(this._concats_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseARegExp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
index 3fb61c1223da3c12be5fb8f3ede42d16c395602c..eb26fbb23d1a3582edfe236e70dbe42813aea2de 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
@@ -29,6 +29,7 @@ public final class ARegExpBasic extends PBasic
             cloneNode(this._regExp_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseARegExpBasic(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
index 64273f245c39b84f99bf9e08f1c9f99fb5da2d68..a6a4a057038fe78eaaa3292583360b160603e5ec 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
@@ -29,6 +29,7 @@ public final class ASetBasic extends PBasic
             cloneNode(this._set_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseASetBasic(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
index 7f32c1705ed4ca877acbabd4aea47a135dd00c7d..75696878e70e53f3ceaf23ee76aee62f3b5b27d9 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
@@ -39,6 +39,7 @@ public final class ASimpleListTerm extends PListTerm
             cloneNode(this._simpleTermTail_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseASimpleListTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
index 050fcbeaae99c71b438a171dca922a49b839c069..c7efc79b7fcddcbeeaeb2eaa13c91e9cfcc67224 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
@@ -39,6 +39,7 @@ public final class ASimpleTerm extends PTerm
             cloneNode(this._simpleTermTail_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseASimpleTerm(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
index 7747213f944219d851fe55a4b41101bf3e9d6e10..6db4bfd0da9e3cddbcf72d2961204fac486da328 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
@@ -29,6 +29,7 @@ public final class AStarUnOp extends PUnOp
             cloneNode(this._star_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAStarUnOp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateList.java b/src/main/java/org/sablecc/sablecc/node/AStateList.java
index 1fe6417cbd0386a5a38b2089f5db8a196b536a5e..ddd52fa48b0559eab2180d56761eca441eb20481 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateList.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateList.java
@@ -40,6 +40,7 @@ public final class AStateList extends PStateList
             cloneList(this._stateLists_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAStateList(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
index d2014d4702a700b61495b79780f75f80b4a7e212..2048ae851f02cfbf16c92123d5d1f33b52648d79 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
@@ -34,6 +34,7 @@ public final class AStateListTail extends PStateListTail
             cloneNode(this._transition_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAStateListTail(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStates.java b/src/main/java/org/sablecc/sablecc/node/AStates.java
index 13745120b969613643b51d92d9f0c1ea7cdc5d7c..6892bec6dcac98cbfd615729d52f5aea86fe0498 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStates.java
@@ -30,6 +30,7 @@ public final class AStates extends PStates
             cloneList(this._listId_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAStates(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
index f4e449e422afc6aacef5619bfc44f0934fcdd5d8..d230a78be49d167573fa91d06d8b10f5d29d25c0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
@@ -29,6 +29,7 @@ public final class AStringBasic extends PBasic
             cloneNode(this._string_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAStringBasic(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
index 5bca3ad9f625e0e5ed0746b50c41c1a1e2727895..d4f39d66af42bf610571e1868116e08f2aa25cef 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
@@ -49,6 +49,7 @@ public final class ATokenDef extends PTokenDef
             cloneNode(this._lookAhead_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseATokenDef(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
index 66d2b5a3bdd67271a4b617de41e6dd52985bd1f7..e59ccb368f42cde3ee60a05666c337fa59c6e46d 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
@@ -19,6 +19,7 @@ public final class ATokenSpecifier extends PSpecifier
         return new ATokenSpecifier();
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseATokenSpecifier(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokens.java b/src/main/java/org/sablecc/sablecc/node/ATokens.java
index 1755173b0bfd902dca4812c004586b034b27bddf..37d2beb2fa4a051e408e7bcd07f4a47afed5cc88 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokens.java
@@ -30,6 +30,7 @@ public final class ATokens extends PTokens
             cloneList(this._tokenDefs_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseATokens(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATransition.java b/src/main/java/org/sablecc/sablecc/node/ATransition.java
index 8c2a8317c95a33455c95e38c5042f149002440b6..bd4d79f3d2341291808344ca03f05457006ec899 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATransition.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATransition.java
@@ -29,6 +29,7 @@ public final class ATransition extends PTransition
             cloneNode(this._id_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseATransition(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/AUnExp.java b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
index 6798dd233f0b98e93bf491d94e98a1a75ffae0fc..2fd59d7cc1f44cf394310f650266edda0b790a46 100644
--- a/src/main/java/org/sablecc/sablecc/node/AUnExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
@@ -34,6 +34,7 @@ public final class AUnExp extends PUnExp
             cloneNode(this._unOp_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseAUnExp(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/EOF.java b/src/main/java/org/sablecc/sablecc/node/EOF.java
index c7e38af7c606c57fdbef5f97e423ffbb54ec3577..21bcc0c9c0ec8cf5294072e99d2630c47de2805e 100644
--- a/src/main/java/org/sablecc/sablecc/node/EOF.java
+++ b/src/main/java/org/sablecc/sablecc/node/EOF.java
@@ -25,6 +25,7 @@ public final class EOF extends Token
         return new EOF(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseEOF(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/Start.java b/src/main/java/org/sablecc/sablecc/node/Start.java
index d6d58e5237b404c4591fbe2e96ceb1cfdf255865..f8866083a9cede871f9bfcd95ae64450e3f5f05c 100644
--- a/src/main/java/org/sablecc/sablecc/node/Start.java
+++ b/src/main/java/org/sablecc/sablecc/node/Start.java
@@ -30,6 +30,7 @@ public final class Start extends Node
             cloneNode(this._eof_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseStart(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TAbstract.java b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
index eb97a3985015f601b66f0c4bee17d73b7087bab4..3008141d30cd9cedec1332d46047bdb3064c5227 100644
--- a/src/main/java/org/sablecc/sablecc/node/TAbstract.java
+++ b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
@@ -25,6 +25,7 @@ public final class TAbstract extends Token
       return new TAbstract(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTAbstract(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TArrow.java b/src/main/java/org/sablecc/sablecc/node/TArrow.java
index d917abf242139caabf6b3c74f7ea435a12ddecf6..37c0fb46ea188900cd59a805b639d95515fc3157 100644
--- a/src/main/java/org/sablecc/sablecc/node/TArrow.java
+++ b/src/main/java/org/sablecc/sablecc/node/TArrow.java
@@ -25,6 +25,7 @@ public final class TArrow extends Token
       return new TArrow(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTArrow(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TBar.java b/src/main/java/org/sablecc/sablecc/node/TBar.java
index 9461f60b3ac5f22519d0c387ebba65db15e62efa..1fd51588882fe86dd19ba2fbc742c13275081958 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBar.java
@@ -25,6 +25,7 @@ public final class TBar extends Token
       return new TBar(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTBar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TBlank.java b/src/main/java/org/sablecc/sablecc/node/TBlank.java
index 50351284dea97426246abb99aadf31f2307b27ee..f1e1825f7cf11466ea56d3a42d88b906c2a1a718 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBlank.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBlank.java
@@ -25,6 +25,7 @@ public final class TBlank extends Token
       return new TBlank(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTBlank(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TChar.java b/src/main/java/org/sablecc/sablecc/node/TChar.java
index a5963f42fcbee945656efcb52c2bb7c1e06179f5..15fd312c06bcd0bddcea54beee5d2ec8ec8496cd 100644
--- a/src/main/java/org/sablecc/sablecc/node/TChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TChar.java
@@ -25,6 +25,7 @@ public final class TChar extends Token
       return new TChar(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TColon.java b/src/main/java/org/sablecc/sablecc/node/TColon.java
index 551d2671788f800ec806081aca0234df1afe0566..09962ad96a82f2f7c4154726d4aa61c3253f258a 100644
--- a/src/main/java/org/sablecc/sablecc/node/TColon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TColon.java
@@ -25,6 +25,7 @@ public final class TColon extends Token
       return new TColon(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTColon(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TComma.java b/src/main/java/org/sablecc/sablecc/node/TComma.java
index 1bf528aeed09cec60b5d944df79efca87539f1d5..f84089749708c717e147a6fc75aa7d2737915dce 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComma.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComma.java
@@ -25,6 +25,7 @@ public final class TComma extends Token
       return new TComma(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTComma(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TComment.java b/src/main/java/org/sablecc/sablecc/node/TComment.java
index cf3af65c569af3e4d8f79f5859d896f76382421a..9e61043463544e3c99c912c308e6c8d80bde5581 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComment.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComment.java
@@ -25,6 +25,7 @@ public final class TComment extends Token
       return new TComment(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTComment(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TDDot.java b/src/main/java/org/sablecc/sablecc/node/TDDot.java
index 9b8b97131d4f929d77e90528ca3ab2071c92aa83..13a4144d7f19220f3992c2268018783681f18af0 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDDot.java
@@ -25,6 +25,7 @@ public final class TDDot extends Token
       return new TDDot(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTDDot(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TDecChar.java b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
index b66df0cb7ed311e8e51dcd7f54d9ddeac84cf6af..3e3cdd938414f81c0d27e8ae5e9a63196361911e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
@@ -25,6 +25,7 @@ public final class TDecChar extends Token
       return new TDecChar(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTDecChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TDot.java b/src/main/java/org/sablecc/sablecc/node/TDot.java
index f53c313d905f848012d8de0202978a00a6d4193e..b3f0227f1187b65343d976fd40912bcef8dc63a6 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDot.java
@@ -25,6 +25,7 @@ public final class TDot extends Token
       return new TDot(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTDot(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TEqual.java b/src/main/java/org/sablecc/sablecc/node/TEqual.java
index 650030f450d92a2b83bbaff1039726e787f71a6e..8fa2a3c13a398ebaea4ecd06cb619f5b8925eade 100644
--- a/src/main/java/org/sablecc/sablecc/node/TEqual.java
+++ b/src/main/java/org/sablecc/sablecc/node/TEqual.java
@@ -25,6 +25,7 @@ public final class TEqual extends Token
       return new TEqual(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTEqual(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/THelpers.java b/src/main/java/org/sablecc/sablecc/node/THelpers.java
index b13dc0597798eb1ca84e85d474ea149db9087913..27e703fbe46553641d78a55a6e4678298f969444 100644
--- a/src/main/java/org/sablecc/sablecc/node/THelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/THelpers.java
@@ -25,6 +25,7 @@ public final class THelpers extends Token
       return new THelpers(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTHelpers(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/THexChar.java b/src/main/java/org/sablecc/sablecc/node/THexChar.java
index b1709447a33f6a786b0ed7d9d92b050b98fcc790..5de2470f4013fff6b8e131993ab8e0faa119fcbe 100644
--- a/src/main/java/org/sablecc/sablecc/node/THexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/THexChar.java
@@ -25,6 +25,7 @@ public final class THexChar extends Token
       return new THexChar(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTHexChar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TId.java b/src/main/java/org/sablecc/sablecc/node/TId.java
index b3fc9b397ce0b5302c4acf6dc985eb62700d67e7..9f51ec14cc2d96c5f4e3f33679b1dd00a7b99dd5 100644
--- a/src/main/java/org/sablecc/sablecc/node/TId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TId.java
@@ -25,6 +25,7 @@ public final class TId extends Token
       return new TId(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTId(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TIgnored.java b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
index 34762f2fa6b17399cc2e24b73580ed2167f5bd6e..f7db90fb135c7a0f168c57cd0c70a2b9339ff9da 100644
--- a/src/main/java/org/sablecc/sablecc/node/TIgnored.java
+++ b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
@@ -25,6 +25,7 @@ public final class TIgnored extends Token
       return new TIgnored(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTIgnored(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBkt.java b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
index 8bccb003d1b494531165605185499ae56fbca45b..9878d0437bdab502b40100b60f4a79e91b761358 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
@@ -25,6 +25,7 @@ public final class TLBkt extends Token
       return new TLBkt(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTLBkt(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBrace.java b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
index 5a28eda9adfdd3a3704bdbd60fd648f81bd69f17..5b084d3ef6820f1dc7dc2cb94c2ef78faba03a92 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
@@ -25,6 +25,7 @@ public final class TLBrace extends Token
       return new TLBrace(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTLBrace(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TLPar.java b/src/main/java/org/sablecc/sablecc/node/TLPar.java
index e61eefc50a033e3d204a9084d707b26aadf1973b..2f89efff5a3ce000c6eee6d1d22da8053449a590 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLPar.java
@@ -25,6 +25,7 @@ public final class TLPar extends Token
       return new TLPar(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTLPar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TMinus.java b/src/main/java/org/sablecc/sablecc/node/TMinus.java
index b65ff3bfe51d19c4e1c6190fd43c3e5d39c9a870..7bb07c0f38e42ffb58fe2cc43a8e38ef3285eb67 100644
--- a/src/main/java/org/sablecc/sablecc/node/TMinus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TMinus.java
@@ -25,6 +25,7 @@ public final class TMinus extends Token
       return new TMinus(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTMinus(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TNew.java b/src/main/java/org/sablecc/sablecc/node/TNew.java
index 9528c703061739344621bd597d43789416b1b3e8..58e7f8daf298a2062851df1d28783e2a8178cadd 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNew.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNew.java
@@ -25,6 +25,7 @@ public final class TNew extends Token
       return new TNew(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTNew(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TNull.java b/src/main/java/org/sablecc/sablecc/node/TNull.java
index 7f9ff100c2effbbba41b45bfd7ba487febc8b8ca..aa86d78ce5e03ac7286e329029fb4bf109e2b2b2 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNull.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNull.java
@@ -25,6 +25,7 @@ public final class TNull extends Token
       return new TNull(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTNull(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TPackage.java b/src/main/java/org/sablecc/sablecc/node/TPackage.java
index 09ecf6b9f7556faecdab39d8b0babe8dc21dfee8..8d6b042a64d1d9b8cfd2894848a7a421cada810e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPackage.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPackage.java
@@ -25,6 +25,7 @@ public final class TPackage extends Token
       return new TPackage(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTPackage(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TPkgId.java b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
index 43be1ae4597271a7b111d1205e260a114470d876..27ce841cd86dbbcdbaa847b40a529e0b3d700850 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPkgId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
@@ -25,6 +25,7 @@ public final class TPkgId extends Token
       return new TPkgId(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTPkgId(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TPlus.java b/src/main/java/org/sablecc/sablecc/node/TPlus.java
index d10d2754f536b2b78a6c463543c929d58a6b0e93..f51369a77226cef935362830b62ea7f00ecb5739 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPlus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPlus.java
@@ -25,6 +25,7 @@ public final class TPlus extends Token
       return new TPlus(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTPlus(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
index 62981d843559d42646ee73b2360f39cf545b4114..651e6805a422ba4a569f844bb89901866ad0d909 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
@@ -25,6 +25,7 @@ public final class TProductionSpecifier extends Token
       return new TProductionSpecifier(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTProductionSpecifier(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductions.java b/src/main/java/org/sablecc/sablecc/node/TProductions.java
index 4c84479e81c10fa19d2a3053aa6348c831efde12..f372f62260f0c0be812676027e5a78c8d888080c 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductions.java
@@ -25,6 +25,7 @@ public final class TProductions extends Token
       return new TProductions(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTProductions(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TQMark.java b/src/main/java/org/sablecc/sablecc/node/TQMark.java
index 1783c9d0dd7365181654254b19de3baddfa64109..c3f059f1ddd56a334a4fb74efbb12e54f05a646f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TQMark.java
+++ b/src/main/java/org/sablecc/sablecc/node/TQMark.java
@@ -25,6 +25,7 @@ public final class TQMark extends Token
       return new TQMark(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTQMark(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBkt.java b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
index 06f97f37280a1c4a1ae27bd6ec2db0e48576e287..b75212c1b98baad9d090e4d2eb92e5baef7bcf56 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
@@ -25,6 +25,7 @@ public final class TRBkt extends Token
       return new TRBkt(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTRBkt(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBrace.java b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
index b3790e238c7aeabae7dbe22493f3cc3305f0caae..7b8bffc1ce09a70ded58ef8dbd17b0ae2d3ef780 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
@@ -25,6 +25,7 @@ public final class TRBrace extends Token
       return new TRBrace(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTRBrace(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TRPar.java b/src/main/java/org/sablecc/sablecc/node/TRPar.java
index 8ae718064fdb9095345c06af77793312edd9ab39..6ebc6e770adb28c91af11ff40081d635e1c041f8 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRPar.java
@@ -25,6 +25,7 @@ public final class TRPar extends Token
       return new TRPar(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTRPar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
index 7459a88b2fd7e1f0324ceec8848618d7518e6776..5e804223dc0d039187014dad6be181d516cb7ff2 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
@@ -25,6 +25,7 @@ public final class TSemicolon extends Token
       return new TSemicolon(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTSemicolon(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TSlash.java b/src/main/java/org/sablecc/sablecc/node/TSlash.java
index 9b6c4d064f6183470cb2b052c3f0729789b279b2..44abf4cb8ddfd0d80365e800314f4e2701c2715c 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSlash.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSlash.java
@@ -25,6 +25,7 @@ public final class TSlash extends Token
       return new TSlash(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTSlash(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TStar.java b/src/main/java/org/sablecc/sablecc/node/TStar.java
index d07c9897b349c4fb52f2dfa79eee5a6e4f3cd866..639add0cc776152a2cdbd83bf955b7cc1b0c4cff 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStar.java
@@ -25,6 +25,7 @@ public final class TStar extends Token
       return new TStar(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTStar(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TStates.java b/src/main/java/org/sablecc/sablecc/node/TStates.java
index a589aebe2b1e16824828ec30240f04082f8f1b88..26ec040cfe11d35355a493163485eed37bcce986 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStates.java
@@ -25,6 +25,7 @@ public final class TStates extends Token
       return new TStates(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTStates(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TString.java b/src/main/java/org/sablecc/sablecc/node/TString.java
index b9990c0a14aa614f888e814fcad4cd32529a0138..bd6df982b4e358c21c4fa5dd28185202b388a784 100644
--- a/src/main/java/org/sablecc/sablecc/node/TString.java
+++ b/src/main/java/org/sablecc/sablecc/node/TString.java
@@ -25,6 +25,7 @@ public final class TString extends Token
       return new TString(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTString(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TSyntax.java b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
index 46198509cf452f6f4b3ed725dc5c8f68917075a0..2740761a30b3812c73f55165e36ffe0652b3b7f8 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSyntax.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
@@ -25,6 +25,7 @@ public final class TSyntax extends Token
       return new TSyntax(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTSyntax(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
index 99c163f63947e424cf12037889c0ee53eb32401c..e1977915ecbb3c99d07c8b48eb3daa1d7ef0f507 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
@@ -25,6 +25,7 @@ public final class TTokenSpecifier extends Token
       return new TTokenSpecifier(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTTokenSpecifier(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokens.java b/src/main/java/org/sablecc/sablecc/node/TTokens.java
index a89cfc332df8fe25cc3fdb7770739feb2ade5b47..08e6f2b93b57e7bb848b761977c9a919756693d7 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokens.java
@@ -25,6 +25,7 @@ public final class TTokens extends Token
       return new TTokens(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTTokens(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/TTree.java b/src/main/java/org/sablecc/sablecc/node/TTree.java
index 49d7e1397fe094bef96a5470d61f613146aad6a4..040377aac8b05d5b3c7b60809bd223bcf25b9648 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTree.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTree.java
@@ -25,6 +25,7 @@ public final class TTree extends Token
       return new TTree(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseTTree(this);
diff --git a/src/main/java/org/sablecc/sablecc/node/Token.java b/src/main/java/org/sablecc/sablecc/node/Token.java
index 93820c0f791db1df1cf997b958fd9e2ad219b465..e93737c4e9957ce995e4bdadccbfbff645474efc 100644
--- a/src/main/java/org/sablecc/sablecc/node/Token.java
+++ b/src/main/java/org/sablecc/sablecc/node/Token.java
@@ -12,31 +12,37 @@ public abstract class Token extends Node implements IToken
     private int line;
     private int pos;
 
+    @Override
     public String getText()
     {
         return this.text;
     }
 
+    @Override
     public void setText(  String text)
     {
         this.text = text;
     }
 
+    @Override
     public int getLine()
     {
         return this.line;
     }
 
+    @Override
     public void setLine(  int line)
     {
         this.line = line;
     }
 
+    @Override
     public int getPos()
     {
         return this.pos;
     }
 
+    @Override
     public void setPos(  int pos)
     {
         this.pos = pos;
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index 22f9263ce6cef8eb5028a4e766edff599356b28c..aaa73588cd15da1260e1135099e48939c95f5de9 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -43,6 +43,7 @@ public class Parser implements IParser
 
 
     private Map<PositionedNode, SourcecodeRange> mapping = new HashMap<PositionedNode, SourcecodeRange>();
+    @Override
     public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; }
 
     protected void checkResult(Object elementToCheck) {
diff --git a/src/main/resources/org/sablecc/sablecc/alternatives.txt b/src/main/resources/org/sablecc/sablecc/alternatives.txt
index faee29bbb5602733878bb3d6bebdf6f85a19b39e..5a18d9dbb238367c7a641f295a4a07f1303b6949 100644
--- a/src/main/resources/org/sablecc/sablecc/alternatives.txt
+++ b/src/main/resources/org/sablecc/sablecc/alternatives.txt
@@ -102,6 +102,7 @@ $
 
 Macro:Apply
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).case$0$(this);
diff --git a/src/main/resources/org/sablecc/sablecc/analyses.txt b/src/main/resources/org/sablecc/sablecc/analyses.txt
index 5c0e344f8fb6cf9e767a234d4a817015ce0d0be5..73a44cb2cf98b8b3ce71613b0d1f885f09fd6a1f 100644
--- a/src/main/resources/org/sablecc/sablecc/analyses.txt
+++ b/src/main/resources/org/sablecc/sablecc/analyses.txt
@@ -50,6 +50,7 @@ public class AnalysisAdapter implements Analysis
     private Hashtable<Node,Object> in;
     private Hashtable<Node,Object> out;
 
+    @Override
     public Object getIn(Node node)
     {
         if(this.in == null)
@@ -60,6 +61,7 @@ public class AnalysisAdapter implements Analysis
         return this.in.get(node);
     }
 
+    @Override
     public void setIn(Node node, Object o)
     {
         if(this.in == null)
@@ -77,6 +79,7 @@ public class AnalysisAdapter implements Analysis
         }
     }
 
+    @Override
     public Object getOut(Node node)
     {
         if(this.out == null)
@@ -87,6 +90,7 @@ public class AnalysisAdapter implements Analysis
         return this.out.get(node);
     }
 
+    @Override
     public void setOut(Node node, Object o)
     {
         if(this.out == null)
@@ -108,6 +112,7 @@ $
 
 Macro:AnalysisAdapterStart
 
+    @Override
     public void caseStart(Start node)
     {
         defaultCase(node);
@@ -117,6 +122,7 @@ $
 
 Macro:AnalysisAdapterBody
 
+    @Override
     public void case$0$($0$ node)
     {
         defaultCase(node);
@@ -126,6 +132,7 @@ $
 
 Macro:AnalysisAdapterTail
 
+    @Override
     public void caseEOF(EOF node)
     {
         defaultCase(node);
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index 12b4cdf02702829924d7db9dd3c24224b4524db1..386a5948d4ca3acebd2ce464749043e83b0748e2 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -54,6 +54,7 @@ public class Lexer implements ITokenListContainer
         return nextList;
     }
 
+    @Override
     public List<IToken> getTokenList() {
         return tokenList;
     }
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index eef5e452c3b3b3541084ea87f5fd07b4175c5c05..08377d859960ee4682fa40d547783bd40b5dc769 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -51,6 +51,7 @@ public class Parser implements IParser
 
 
     private Map<PositionedNode, SourcecodeRange> mapping = new HashMap<PositionedNode, SourcecodeRange>();
+    @Override
     public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; }
 
     protected void checkResult(Object elementToCheck) {
diff --git a/src/main/resources/org/sablecc/sablecc/tokens.txt b/src/main/resources/org/sablecc/sablecc/tokens.txt
index a58680930db48d9e76ac18a4570fce2b9a31b256..6641f9f76c65a519685d550754623c13298cfe9d 100644
--- a/src/main/resources/org/sablecc/sablecc/tokens.txt
+++ b/src/main/resources/org/sablecc/sablecc/tokens.txt
@@ -36,6 +36,7 @@ public final class $2$ extends Token
       return new $2$(getText(), getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).case$2$(this);
@@ -76,6 +77,7 @@ public final class $2$ extends Token
       return new $2$(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).case$2$(this);
diff --git a/src/main/resources/org/sablecc/sablecc/utils.txt b/src/main/resources/org/sablecc/sablecc/utils.txt
index 98c8db0768659846510d232e57a324fc00bda5df..2b60e5e93a626f054f0b1f87a2f9badced6617aa 100644
--- a/src/main/resources/org/sablecc/sablecc/utils.txt
+++ b/src/main/resources/org/sablecc/sablecc/utils.txt
@@ -38,6 +38,7 @@ public final class Start extends Node
             cloneNode(this._eof_));
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseStart(this);
@@ -168,6 +169,7 @@ public final class EOF extends Token
         return new EOF(getLine(), getPos());
     }
 
+    @Override
     public void apply(Switch sw)
     {
         ((Analysis) sw).caseEOF(this);
@@ -191,31 +193,37 @@ public abstract class Token extends Node implements IToken
     private int line;
     private int pos;
 
+    @Override
     public String getText()
     {
         return this.text;
     }
 
+    @Override
     public void setText(  String text)
     {
         this.text = text;
     }
 
+    @Override
     public int getLine()
     {
         return this.line;
     }
 
+    @Override
     public void setLine(  int line)
     {
         this.line = line;
     }
 
+    @Override
     public int getPos()
     {
         return this.pos;
     }
 
+    @Override
     public void setPos(  int pos)
     {
         this.pos = pos;