Parser name change.

Signed-off-by: Michal Kit <kit@d3s.mff.cuni.cz>
d3scomp · Nov 30, 2012 · a43c22a · a43c22a
1 parent e91bb96
commit a43c22a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/jdeeco-core/.settings/sf.eclipse.javacc.prefs b/jdeeco-core/.settings/sf.eclipse.javacc.prefs
@@ -5,7 +5,7 @@ JJTREE_OPTIONS=
 JJ_NATURE=true
 JTB_OPTIONS=
 MARK_GEN_FILES_AS_DERIVED=true
-RUNTIME_JJJAR=D\:/Programs/Eclipse/plugins/sf.eclipse.javacc_1.5.25/javacc.jar
+RUNTIME_JJJAR=D\:\\Programs\\JavaCC\\bin\\lib\\javacc.jar
 RUNTIME_JTBJAR=D\:/Programs/Eclipse/plugins/sf.eclipse.javacc_1.5.25/jtb-1.4.6.jar
 SUPPRESS_WARNINGS=false
 eclipse.preferences.version=1
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/KnowledgePath.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/KnowledgePath.java
@@ -13,7 +13,7 @@ public class KnowledgePath implements Serializable {
 	private final PNode pathNode;
 
 	public KnowledgePath(String path) throws ParseException {
-		this.pathNode = JDEECoParser.parse(path);
+		this.pathNode = PathParser.parse(path);
 	}
 
 	public String getEvaluatedPath(KnowledgeManager km, String coord,

diff --git a/.../d3s/deeco/path/grammar/JDEECoParser.java → ...ff/d3s/deeco/path/grammar/PathParser.java b/.../d3s/deeco/path/grammar/JDEECoParser.java → ...ff/d3s/deeco/path/grammar/PathParser.java
@@ -1,14 +1,14 @@
-/* Generated By:JavaCC: Do not edit this line. JDEECoParser.java */
+/* Generated By:JavaCC: Do not edit this line. PathParser.java */
 package cz.cuni.mff.d3s.deeco.path.grammar;
 import cz.cuni.mff.d3s.deeco.path.grammar.PNode;
 import java.io.ByteArrayInputStream;
 
 /** Simple brace matcher. */
-public class JDEECoParser implements JDEECoParserConstants {
+public class PathParser implements PathParserConstants {
   /** Main entry point. */
   public static PNode parse(String expression) throws ParseException
   {
-    JDEECoParser parser = new JDEECoParser(new ByteArrayInputStream(expression.getBytes()));
+    PathParser parser = new PathParser(new ByteArrayInputStream(expression.getBytes()));
     return parser.parseExpression();
   }
 
@@ -59,7 +59,7 @@ final public PNode parseExpression() throws ParseException {
   }
 
   /** Generated Token Manager. */
-  public JDEECoParserTokenManager token_source;
+  public PathParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
   /** Current token. */
   public Token token;
@@ -77,13 +77,13 @@ private static void jj_la1_init_0() {
    }
 
   /** Constructor with InputStream. */
-  public JDEECoParser(java.io.InputStream stream) {
+  public PathParser(java.io.InputStream stream) {
      this(stream, null);
   }
   /** Constructor with InputStream and supplied encoding */
-  public JDEECoParser(java.io.InputStream stream, String encoding) {
+  public PathParser(java.io.InputStream stream, String encoding) {
     try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source = new JDEECoParserTokenManager(jj_input_stream);
+    token_source = new PathParserTokenManager(jj_input_stream);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
@@ -105,9 +105,9 @@ public void ReInit(java.io.InputStream stream, String encoding) {
   }
 
   /** Constructor. */
-  public JDEECoParser(java.io.Reader stream) {
+  public PathParser(java.io.Reader stream) {
     jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    token_source = new JDEECoParserTokenManager(jj_input_stream);
+    token_source = new PathParserTokenManager(jj_input_stream);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
@@ -125,7 +125,7 @@ public void ReInit(java.io.Reader stream) {
   }
 
   /** Constructor with generated Token Manager. */
-  public JDEECoParser(JDEECoParserTokenManager tm) {
+  public PathParser(PathParserTokenManager tm) {
     token_source = tm;
     token = new Token();
     jj_ntk = -1;
@@ -134,7 +134,7 @@ public JDEECoParser(JDEECoParserTokenManager tm) {
   }
 
   /** Reinitialise. */
-  public void ReInit(JDEECoParserTokenManager tm) {
+  public void ReInit(PathParserTokenManager tm) {
     token_source = tm;
     token = new Token();
     jj_ntk = -1;

diff --git a/...ff/d3s/deeco/path/grammar/JDEECoParser.jj → .../mff/d3s/deeco/path/grammar/PathParser.jj b/...ff/d3s/deeco/path/grammar/JDEECoParser.jj → .../mff/d3s/deeco/path/grammar/PathParser.jj
@@ -30,23 +30,23 @@ options {
   STATIC = false;
 }
 
-PARSER_BEGIN(JDEECoParser)
+PARSER_BEGIN(PathParser)
 package cz.cuni.mff.d3s.deeco.path.grammar;
 import cz.cuni.mff.d3s.deeco.path.grammar.PNode;
 import java.io.ByteArrayInputStream;
 
 /** Simple brace matcher. */
-public class JDEECoParser
+public class PathParser
 {
   /** Main entry point. */
   public static PNode parse(String expression) throws ParseException
   {
-    JDEECoParser parser = new JDEECoParser(new ByteArrayInputStream(expression.getBytes()));
+    PathParser parser = new PathParser(new ByteArrayInputStream(expression.getBytes()));
     return parser.parseExpression();
   }
 }
 
-PARSER_END(JDEECoParser)
+PARSER_END(PathParser)
 
 TOKEN [ IGNORE_CASE ] :
 {

diff --git a/...o/path/grammar/JDEECoParserConstants.java → ...eco/path/grammar/PathParserConstants.java b/...o/path/grammar/JDEECoParserConstants.java → ...eco/path/grammar/PathParserConstants.java
@@ -1,12 +1,12 @@
-/* Generated By:JavaCC: Do not edit this line. JDEECoParserConstants.java */
+/* Generated By:JavaCC: Do not edit this line. PathParserConstants.java */
 package cz.cuni.mff.d3s.deeco.path.grammar;
 
 
 /**
  * Token literal values and constants.
  * Generated by org.javacc.parser.OtherFilesGen#start()
  */
-public interface JDEECoParserConstants {
+public interface PathParserConstants {
 
   /** End of File. */
   int EOF = 0;

diff --git a/...ath/grammar/JDEECoParserTokenManager.java → .../path/grammar/PathParserTokenManager.java b/...ath/grammar/JDEECoParserTokenManager.java → .../path/grammar/PathParserTokenManager.java
@@ -1,10 +1,10 @@
-/* Generated By:JavaCC: Do not edit this line. JDEECoParserTokenManager.java */
+/* Generated By:JavaCC: Do not edit this line. PathParserTokenManager.java */
 package cz.cuni.mff.d3s.deeco.path.grammar;
 import cz.cuni.mff.d3s.deeco.path.grammar.PNode;
 import java.io.ByteArrayInputStream;
 
 /** Token Manager. */
-public class JDEECoParserTokenManager implements JDEECoParserConstants
+public class PathParserTokenManager implements PathParserConstants
 {
 
   /** Debug output. */
@@ -341,14 +341,14 @@ else if (curChar == 91)
 private final int[] jjstateSet = new int[8];
 protected char curChar;
 /** Constructor. */
-public JDEECoParserTokenManager(SimpleCharStream stream){
+public PathParserTokenManager(SimpleCharStream stream){
    if (SimpleCharStream.staticFlag)
       throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
    input_stream = stream;
 }
 
 /** Constructor. */
-public JDEECoParserTokenManager(SimpleCharStream stream, int lexState){
+public PathParserTokenManager(SimpleCharStream stream, int lexState){
    this(stream);
    SwitchTo(lexState);
 }