[Jboss-svn-commits] JBL Code SVN: r2185 - in trunk/labs/jbossrules/drools-core/src: main/java/org/drools/lang test/java/org/drools/lang

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-01-24 03:31:09 -0500 (Tue, 24 Jan 2006)
New Revision: 2185

Modified:
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java
   trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl
Log:
silly idea. Undid it mostly. Don't want people to do inline comments anyway.

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java	2006-01-24 08:19:56 UTC (rev 2184)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java	2006-01-24 08:31:09 UTC (rev 2185)
@@ -335,7 +335,7 @@
 				return null;
 			}
 			
-			String trimLine = line.trim();
+			String trimLine = line.trim(); 
 			
 			if ( trimLine.length() == 0 || trimLine.startsWith( COMMENT_1 ) || trimLine.startsWith( COMMENT_2 ) ) {
 				line = null;
@@ -343,7 +343,7 @@
 		}
 		
 		reader.reset();
-		return stripTrailingComments(line);
+		return line;
 	}
 	
 	protected String consume() throws IOException {
@@ -370,19 +370,7 @@
 			}
 		}
 		
-		return stripTrailingComments(line);
+		return line;
 	}
-    
-    /**
-     * Removes "inline" comments from string.
-     */
-    protected String stripTrailingComments(final String line) {
-        //BOB: is this more efficient with a single regex? 
-        //Then can have a single definition of a comment?
-        int pos = line.lastIndexOf(COMMENT_1);
-        if (pos  > 0) return line.substring(0, pos);
-        pos = line.lastIndexOf(COMMENT_2);
-        if (pos > 0)  return line.substring(0, pos);
-        return line;
-    }
+
 }

Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl	2006-01-24 08:19:56 UTC (rev 2184)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl	2006-01-24 08:31:09 UTC (rev 2185)
@@ -3,11 +3,11 @@
 
 // yes, you can use silly java comments
 
-package org.drools.lang;
+package org.drools.lang; 
 
 # semi colons are optional, we're line-centric
 
-import java.util.List//trailing comment
+import java.util.List
 import java.util.ArrayList;
 
 # use expanders for domain specific and pseudo natural language extensions
@@ -15,7 +15,7 @@
 
 
 rule find_seating
-    when #trailing comment
+    when
 	    context => Context( state == Context.ASSIGN_SEATS ) 
 	    Seating( seatingId:id, seatingPid:pid, pathDone == true, seatingRightSeat:rightSeat, seatingRightGuestName:rightGuestName )