[jboss-svn-commits] JBL Code SVN: r27290 - in labs/jbosstm/workspace/adinn/byteman/trunk: dd/grammar/cup and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 29 10:28:20 EDT 2009
Author: adinn
Date: 2009-06-29 10:28:19 -0400 (Mon, 29 Jun 2009)
New Revision: 27290
Modified:
labs/jbosstm/workspace/adinn/byteman/trunk/build.xml
labs/jbosstm/workspace/adinn/byteman/trunk/dd/grammar/cup/ECAGrammar.cup
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/Expression.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java
Log:
made error messages slightly clearer
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/build.xml
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/build.xml 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/build.xml 2009-06-29 14:28:19 UTC (rev 27290)
@@ -84,6 +84,8 @@
<arg value="-parser" />
<arg value="ECAGrammarParser" />
<arg value="-nonterms"/>
+ <arg value="-expect"/>
+ <arg value="66"/>
<arg value="${dd.grammar.dir}/cup/ECAGrammar.cup"/>
</java>
<delete file="${src.dir}/org/jboss/byteman/rule/grammar/ECATokenLexer.java"/>
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/dd/grammar/cup/ECAGrammar.cup
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/dd/grammar/cup/ECAGrammar.cup 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/dd/grammar/cup/ECAGrammar.cup 2009-06-29 14:28:19 UTC (rev 27290)
@@ -89,7 +89,7 @@
public void error(String message, int line, int col)
{
errorCount++;
- System.out.println(file + " @ " + line + "." + col + " : " + message);
+ System.out.println(file + " line " + line + " : " + message);
}
/** Report a non fatal error (or warning). This method takes a message
@@ -103,12 +103,14 @@
*/
public void report_error(String message, Object info)
{
+ /*
if (info instanceof Symbol) {
Symbol sym = (Symbol)info;
System.err.println(message + " at line " + sym.left + " character " + sym.right);
} else {
System.err.println(message);
}
+ */
}
public void error(String message)
@@ -281,9 +283,7 @@
non terminal ParseNode eca_error_in_event;
non terminal ParseNode eca_error_in_condition;
non terminal ParseNode eca_error_in_action;
-//non terminal ParseNode bindings_error_missing_sepr;
non terminal ParseNode action_expr_list_error_invalid_action;
-//non terminal ParseNode expr_list_error_missing_sepr;
non terminal ParseNode expr_list_error_invalid_expr;
/* precedences from weakest to tightest binding */
@@ -350,15 +350,9 @@
bindings
::= binding:b COMMA bindings:bs {: RESULT = node(ParseNode.COMMA, bleft, bright, b, bs); :}
| binding:b SEMI bindings:bs {: RESULT = node(ParseNode.COMMA, bleft, bright, b, bs); :}
-// | bindings_error_missing_sepr:b {: RESULT = b; :}
| binding:b {: RESULT = b; :}
;
-//bindings_error_missing_sepr
-// ::= binding:b bindings:bs {: error("missing separator", bleft, bright);
-// RESULT = node(ParseNode.COMMA, bleft, bright, b, bs); :}
-// ;
-
binding ::= bind_sym:s ASSIGN expr:e {: RESULT = node(ParseNode.ASSIGN, sleft, sright, s, e); :}
;
@@ -422,16 +416,9 @@
::= expr:e {: RESULT = e; :}
| expr:e COMMA expr_list:el
{: RESULT = node(ParseNode.COMMA, eleft, eright, e, el); :}
-// | expr_list_error_missing_sepr:el {: RESULT = el; :}
| expr_list_error_invalid_expr:el {: RESULT = el; :}
;
-//expr_list_error_missing_sepr
-// ::= expr:e expr_list:el
-// {: error("missing separator");
-// RESULT = node(ParseNode.COMMA, eleft, eright, e, el); :}
-// ;
-
expr_list_error_invalid_expr
::= error COMMA:c expr_list:el
{: error("invalid expression", cleft, cright);
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/Expression.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/Expression.java 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/Expression.java 2009-06-29 14:28:19 UTC (rev 27290)
@@ -70,7 +70,7 @@
public String getPos()
{
- return " file " + rule.getFile() + " @ " + line + "." + charPos;
+ return " file " + rule.getFile() + " line " + line;
}
public Type getType()
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java 2009-06-29 14:28:19 UTC (rev 27290)
@@ -88,7 +88,9 @@
}
public void writeTo(StringWriter stringWriter) {
+ stringWriter.write("\"");
stringWriter.write(text);
+ stringWriter.write("\"");
}
private String text;
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java 2009-06-29 14:28:19 UTC (rev 27290)
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Mon Jun 29 14:03:09 BST 2009
+// Mon Jun 29 15:12:34 BST 2009
//----------------------------------------------------
package org.jboss.byteman.rule.grammar;
@@ -10,7 +10,7 @@
import org.jboss.byteman.rule.grammar.ParseNode;
/** CUP v0.10k generated parser.
- * @version Mon Jun 29 14:03:09 BST 2009
+ * @version Mon Jun 29 15:12:34 BST 2009
*/
public class ECAGrammarParser extends java_cup.runtime.lr_parser {
@@ -665,7 +665,7 @@
public void error(String message, int line, int col)
{
errorCount++;
- System.out.println(file + " @ " + line + "." + col + " : " + message);
+ System.out.println(file + " line " + line + " : " + message);
}
/** Report a non fatal error (or warning). This method takes a message
@@ -679,12 +679,14 @@
*/
public void report_error(String message, Object info)
{
+ /*
if (info instanceof Symbol) {
Symbol sym = (Symbol)info;
System.err.println(message + " at line " + sym.left + " character " + sym.right);
} else {
System.err.println(message);
}
+ */
}
public void error(String message)
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java 2009-06-29 14:28:19 UTC (rev 27290)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.2 on 6/29/09 2:03 PM */
+/* The following code was generated by JFlex 1.4.2 on 6/29/09 3:12 PM */
/*
* JBoss, Home of Professional Open Source
@@ -33,7 +33,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.2
- * on 6/29/09 2:03 PM from the specification file
+ * on 6/29/09 3:12 PM from the specification file
* <tt>dd/grammar/flex/ECAToken.flex</tt>
*/
public class ECATokenLexer implements java_cup.runtime.Scanner {
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java 2009-06-29 14:08:59 UTC (rev 27289)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java 2009-06-29 14:28:19 UTC (rev 27290)
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Mon Jun 29 14:03:09 BST 2009
+// Mon Jun 29 15:12:34 BST 2009
//----------------------------------------------------
package org.jboss.byteman.rule.grammar;
More information about the jboss-svn-commits
mailing list