[jboss-svn-commits] JBL Code SVN: r19500 - labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl.

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

Author: tirelli
Date: 2008-04-08 21:35:21 -0400 (Tue, 08 Apr 2008)
New Revision: 19500

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g
Log:
Improving grammar

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g	2008-04-08 23:53:06 UTC (rev 19499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g	2008-04-09 01:35:21 UTC (rev 19500)
@@ -20,6 +20,7 @@
        VT_VAR_DEF;
        VT_VAR_REF;
        VT_LITERAL;
+       VT_PATTERN;
 }
 
 @parser::header {
@@ -126,10 +127,19 @@
 	;	
 	
 variable_definition
-	: LEFT_CURLY name=LITERAL ( COLLOM pattern=LITERAL )? RIGHT_CURLY
-	-> ^(VT_VAR_DEF $name $pattern? )
+ at init {
+        String text = "";
+}	
+	: LEFT_CURLY name=LITERAL ( COLLOM pat=pattern {text = $pat.text;} )? RIGHT_CURLY
+	-> ^(VT_VAR_DEF $name VT_PATTERN[$pat.start, text] )
 	;
 	
+pattern 
+        : ( LITERAL
+          | LEFT_CURLY LITERAL RIGHT_CURLY
+          )+
+	;	
+	
 variable_reference 
 	: LEFT_CURLY name=LITERAL RIGHT_CURLY
 	-> ^(VT_VAR_REF $name )