[Jboss-svn-commits] JBL Code SVN: r2190 - 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 07:46:23 -0500 (Tue, 24 Jan 2006)
New Revision: 2190

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/ParserTest.java
   trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl
Log:
allow spaces in rule name

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 12:06:36 UTC (rev 2189)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/lang/Parser.java	2006-01-24 12:46:23 UTC (rev 2190)
@@ -24,7 +24,7 @@
 	
     private static Pattern PACKAGE_DECL = Pattern.compile( "\\s*package\\s*([^;]+);?\\s*" );
 	private static Pattern IMPORT_STATEMENT = Pattern.compile( "\\s*import\\s*([^;]+);?\\s*" );
-	private static Pattern RULE_DECL = Pattern.compile( "\\s*rule\\s*([^\\s]+)\\s*" );
+	private static Pattern RULE_DECL = Pattern.compile( "\\s*rule\\s*(.*[^\\s]+)\\s*" );
     
     private static Pattern EXPANDER_STATEMENT = Pattern.compile("\\s*use\\s*expander\\s([^;]+);?\\s*");
 	

Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java	2006-01-24 12:06:36 UTC (rev 2189)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/ParserTest.java	2006-01-24 12:46:23 UTC (rev 2190)
@@ -47,7 +47,7 @@
 		assertEquals( "java.util.ArrayList", parser.getImports().get( 1 ) );
 		
 		assertEquals( 1, parser.getRules().size() );
-		assertEquals( "find_seating", ((Rule)parser.getRules().get(0)).getName() );
+		assertEquals( "find seating", ((Rule)parser.getRules().get(0)).getName() );
         
         assertEquals(null, parser.getExpander());
 	}

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 12:06:36 UTC (rev 2189)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/lang/one-rule.drl	2006-01-24 12:46:23 UTC (rev 2190)
@@ -14,7 +14,7 @@
 # use expander foo;
 
 
-rule find_seating
+rule find seating
     when
 	    context => Context( state == Context.ASSIGN_SEATS ) 
 	    Seating( seatingId:id, seatingPid:pid, pathDone == true, seatingRightSeat:rightSeat, seatingRightGuestName:rightGuestName )