[jboss-svn-commits] JBL Code SVN: r8892 - in labs/jbossrules/trunk/drools-compiler/src/main: java/org/drools/lang/descr and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2007-01-17 19:03:26 -0500 (Wed, 17 Jan 2007)
New Revision: 8892

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
Log:
Fixing IDE issues

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-01-17 22:58:23 UTC (rev 8891)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-01-18 00:03:26 UTC (rev 8892)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-15 18:11:00
+// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-17 19:08:07
 
 	package org.drools.lang;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-01-17 22:58:23 UTC (rev 8891)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-01-18 00:03:26 UTC (rev 8892)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-15 18:10:59
+// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-17 19:08:06
 
 	package org.drools.lang;
 	import java.util.List;
@@ -2163,7 +2163,7 @@
             	    _fsp--;
             	    if (failed) return ;
             	    if ( backtracking==0 ) {
-            	       descrs.addDescr( d ); 
+            	       if(d != null) descrs.addDescr( d ); 
             	    }
 
             	    }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java	2007-01-17 22:58:23 UTC (rev 8891)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java	2007-01-18 00:03:26 UTC (rev 8892)
@@ -26,10 +26,10 @@
     Serializable {
 
     private static final long serialVersionUID = 320;
-    private int               line;
-    private int               column;
-    private int               endLine;
-    private int               endColumn;
+    private int               line = -1;
+    private int               column = -1;
+    private int               endLine = -1;
+    private int               endColumn = -1;
 
     public void setLocation(int line,
                             int column) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-01-17 22:58:23 UTC (rev 8891)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-01-18 00:03:26 UTC (rev 8892)
@@ -652,7 +652,7 @@
 normal_lhs_block[AndDescr descrs]
 	:
 		(	d=lhs
-			{ descrs.addDescr( d ); }
+			{ if(d != null) descrs.addDescr( d ); }
 		)*
 	;