[Jboss-svn-commits] JBL Code SVN: r3760 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/semantics/java test/java/org/drools/semantics/java

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

Author: mic...@jb...
Date: 2006-04-18 04:41:37 -0400 (Tue, 18 Apr 2006)
New Revision: 3760

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/KnowledgeHelperFixer.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java
Log:
JBRULES-184

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java	2006-04-18 05:15:49 UTC (rev 3759)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java	2006-04-18 08:41:37 UTC (rev 3760)
@@ -55,8 +55,8 @@
             if (post != null) {
                 post = fix(post);
             }
-            
-            return pre + matcher.replaceAll(ucFirst(function) + "." + function + "(" + params + ")" ) + post;
+            String target = ucFirst(function) + "." + function + "(" + params + ")";
+            return pre + matcher.replaceAll( KnowledgeHelperFixer.replace( target, "$", "\\$", 128 )) + post;
         }
         return raw;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/KnowledgeHelperFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/KnowledgeHelperFixer.java	2006-04-18 05:15:49 UTC (rev 3759)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/KnowledgeHelperFixer.java	2006-04-18 08:41:37 UTC (rev 3760)
@@ -147,10 +147,10 @@
     
     
     /**
-     * Simple replacer. 
+     * Simple non regex replacer. 
      * jakarta commons provided the inspiration for this.
      */
-    private String replace(String text,
+    static String replace(String text,
                                   String repl,
                                   String with,
                                   int max)

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java	2006-04-18 05:15:49 UTC (rev 3759)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java	2006-04-18 08:41:37 UTC (rev 3760)
@@ -57,6 +57,12 @@
         FunctionFixer fixer = new FunctionFixer();
         assertEquals( "\n\t\n\tAddFive.addFive(list) ;",
                       fixer.fix( "\n\t\n\taddFive ( list ) ;" ) );
-    }  
+    } 
+    
+    public void testWithDollarSigns() {
+        FunctionFixer fixer = new FunctionFixer();
+        assertEquals( "\nFoo.foo($list);",
+                      fixer.fix( "\nfoo($list);" ) );
+    }      
         
 }
\ No newline at end of file