[jboss-svn-commits] JBL Code SVN: r10593 - in labs/jbossrules/branches/3.0.x/drools-compiler/src: test/resources/org/drools/integrationtests and 1 other directory.

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

Author: tirelli
Date: 2007-03-28 16:03:14 -0400 (Wed, 28 Mar 2007)
New Revision: 10593

Modified:
   labs/jbossrules/branches/3.0.x/drools-compiler/src/main/java/org/drools/semantics/java/FunctionBuilder.java
   labs/jbossrules/branches/3.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_FunctionInConsequence.drl
Log:
JBRULES-379: fixing function calls inside other function calls for 3.0.x branch. Test case updated.

Modified: labs/jbossrules/branches/3.0.x/drools-compiler/src/main/java/org/drools/semantics/java/FunctionBuilder.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-compiler/src/main/java/org/drools/semantics/java/FunctionBuilder.java	2007-03-28 20:00:45 UTC (rev 10592)
+++ labs/jbossrules/branches/3.0.x/drools-compiler/src/main/java/org/drools/semantics/java/FunctionBuilder.java	2007-03-28 20:03:14 UTC (rev 10593)
@@ -26,7 +26,8 @@
 
 public class FunctionBuilder {
     private static final StringTemplateGroup functionGroup = new StringTemplateGroup( new InputStreamReader( FunctionBuilder.class.getResourceAsStream( "javaFunction.stg" ) ),
-                                                                                AngleBracketTemplateLexer.class );
+                                                                                      AngleBracketTemplateLexer.class );
+    private FunctionFixer                    fixer         = new FunctionFixer();
 
     public FunctionBuilder() {
 
@@ -57,7 +58,7 @@
                          functionDescr.getParameterNames() );
 
         st.setAttribute( "text",
-                         functionDescr.getText() );
+                         fixer.fix( functionDescr.getText() ) );
 
         return st.toString();
 

Modified: labs/jbossrules/branches/3.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_FunctionInConsequence.drl
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_FunctionInConsequence.drl	2007-03-28 20:00:45 UTC (rev 10592)
+++ labs/jbossrules/branches/3.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_FunctionInConsequence.drl	2007-03-28 20:03:14 UTC (rev 10593)
@@ -6,8 +6,12 @@
 
 global java.util.List list
 
+function void addToTheList( List list, Object element ) {
+    list.add( element );
+}
+
 function void addFive(List list) {
-	list.add( new Integer(5) );
+	addToTheList( list, new Integer(5) );
 }
 
 rule "global rule test"