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

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

Author: mattgeis
Date: 2008-06-07 00:53:38 -0400 (Sat, 07 Jun 2008)
New Revision: 20361

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AntlrDSLMappingEntry.java
Log:
JBRULES-1633: Adjusting numbering of match groups in valuepattern for DSL expansion to cover cases where no variables are declared in the DSL entry


Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AntlrDSLMappingEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AntlrDSLMappingEntry.java	2008-06-07 02:21:32 UTC (rev 20360)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AntlrDSLMappingEntry.java	2008-06-07 04:53:38 UTC (rev 20361)
@@ -130,6 +130,9 @@
 			if(!variables.isEmpty()){
 				Integer tailMatchGroupIndex = (Integer) Collections.max(variables.values());
 				maxGroupIndex = tailMatchGroupIndex.intValue();
+			}else if(headMatchGroupAdded){
+				//if empty, but head group matched, set max group to 1
+				maxGroupIndex++;
 			}
 			maxGroupIndex++;
 			valuePatternBuffer.append("$" + maxGroupIndex);