The proper way to override the trace methods...

Author: jcaillon

src/main/antlr/JPTreeParser.g

@@ -65,6 +65,21 @@ options {
 // This is added to top of the class definitions
 {
 
+    @Override
+    public void traceIndent() {
+        //super.traceIndent();
+    }
+
+    @Override
+    public void traceIn(String s, AST ast) {
+        //super.traceIn(s, ast);
+    }
+
+    @Override
+    public void traceOut(String s, AST ast) {
+        //super.traceOut(s, ast);
+    }
+
 	// Where did the tree parser leave off parsing -- might give us at least a bit
 	// of an idea where things left off if an exception was thrown.
 	// See antlr/TreeParser and the generated code.

src/main/antlr/TreeParser01.g

@@ -52,6 +52,21 @@ options {
 // This is added to top of the class definitions
 {
 
+    @Override
+    public void traceIn(String s, AST ast) {
+        //super.traceIn(s, ast);
+    }
+
+    @Override
+    public void traceOut(String s, AST ast) {
+        //super.traceOut(s, ast);
+    }
+
+    @Override
+    public void traceIndent() {
+        //super.traceIndent();
+    }
+
 	// --- The following are required in all tree parsers ---
 
 	// Where did the tree parser leave off parsing -- might give us at least a bit

src/main/antlr/proeval.g

@@ -15,15 +15,32 @@ package com.joanju.proparse;
 import static com.joanju.proparse.ProEvalSupport.*;
 }
 
-options {
-}
-
 class ProEval extends TreeParser;
+
 options {
 	importVocab = Base;
    	defaultErrorHandler = false;
 }
 
+{
+
+    @Override
+    public void traceIn(String s, AST ast) {
+        //super.traceIn(s, ast);
+    }
+
+    @Override
+    public void traceOut(String s, AST ast) {
+        //super.traceOut(s, ast);
+    }
+
+    @Override
+    public void traceIndent() {
+        //super.traceIndent();
+    }
+
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Begin grammar

src/main/antlr/proparse.g

@@ -46,6 +46,22 @@ options {
 
 // Additional methods and members.
 {
+
+    @Override
+    public void traceIndent() {
+        //super.traceIndent();
+    }
+
+    @Override
+    public void traceIn(String s) throws TokenStreamException {
+        //super.traceIn(s);
+    }
+
+    @Override
+    public void traceOut(String s) throws TokenStreamException {
+        //super.traceOut(s);
+    }
+
 	private boolean schemaTablePriority = false;
 	public ParserSupport support;
 	public DoParse doParse;
@@ -65,7 +81,6 @@ options {
 		to.setHiddenBefore(from.getHiddenBefore());
 	}
 
-
 	/** Override antlr parser getFilename(). */
 	@Override
 	public String getFilename() {

src/main/java/com/joanju/proparse/DoParse.java

@@ -40,7 +40,7 @@ public DoParse(String fileName) {
 	int nextNodeNum;
 	BufferedReader inStream;
 	private Environment env = Environment.instance();
-	ProParserCust parser;
+	ProParser parser;
 	String fileName;
 	TokenVectorIterator tvi;
 
@@ -131,7 +131,7 @@ public void doParse()
 			}
 
 			// Create the parser, with the filter as the input.
-			parser = new ProParserCust(filter);
+			parser = new ProParser(filter);
 			parser.init(this);
 
 			if (justLex) {
@@ -162,11 +162,11 @@ public void doParse()
 			// - just doing a regular parse
 			if (proEval) {
 				parser.program();
-				ProEvalCust proEval = new ProEvalCust();
+				ProEval proEval = new ProEval();
 				proEval.program(parser.getAST());
 			} else if (preProcessCondition) {
 				parser.expression();
-				ProEvalCust proEval = new ProEvalCust();
+				ProEval proEval = new ProEval();
 				preProcessConditionResult = proEval.preproIfEval(parser.getAST());
 			} else {
 				parser.program();

src/main/java/com/joanju/proparse/NodeTypes.java

@@ -83,7 +83,7 @@ static void add(int type, int minAbbrev, String fullText, int flags) {
 		ti.fullText = fullText;
 		if (ti.bitset==0)
 			ti.bitset = flags;
-		nameNums.put(ProParserCust._tokenNames[type], type);
+		nameNums.put(ProParser._tokenNames[type], type);
 	}
 
 
@@ -124,7 +124,7 @@ public static String getFullText(String text) {
 	public static String getTypeName(int n) {
 		if (n > Last_Token_Number || n < 1)
 			return null;
-		String ret = ProParserCust._tokenNames[n];
+		String ret = ProParser._tokenNames[n];
 		if (ret.endsWith("_KW"))
 			ret = ret.substring(0, ret.length()-3);
 		return ret;

src/main/java/com/joanju/proparse/ParserSupport.java

@@ -355,7 +355,7 @@ void setStoreType(JPNode node, SymbolScope.FieldType tabletype) {
 	}
 
 
-	/* Called by ProParserCust at the *end* of the parse. */
+	/* Called by ProParser at the *end* of the parse. */
 	void setTopNode(JPNode refTopNode) { topNode = refTopNode; }