[jboss-svn-commits] JBL Code SVN: r13681 - in labs/jbossrules/branches/mvel-tooling-2007-06-30: drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel and 1 other directories.

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

Author: pombredanne
Date: 2007-07-20 13:51:32 -0400 (Fri, 20 Jul 2007)
New Revision: 13681

Modified:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
Log:
Ported r13676 from trunk to branch mvel-tooling-2007-06-30.

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml	2007-07-20 17:34:46 UTC (rev 13680)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml	2007-07-20 17:51:32 UTC (rev 13681)
@@ -113,6 +113,8 @@
 
       <xi:include href="Chapter-Rule_Language/Section-Rule.xml" />
 
+      <xi:include href="Chapter-Rule_Language/Section-Advanced-CEs.xml" />
+
       <xi:include href="Chapter-Rule_Language/Section-Query.xml" />
 
       <xi:include href="Chapter-Rule_Language/Section-DSL.xml" />
@@ -196,4 +198,4 @@
   </part>
 
   <index />
-</book>
\ No newline at end of file
+</book>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-07-20 17:34:46 UTC (rev 13680)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-07-20 17:51:32 UTC (rev 13681)
@@ -137,7 +137,7 @@
         int brace = 0;
         int sqre = 0;
         int crly = 0;
-        char lastNonWhite = ' ';
+        char lastNonWhite = ';';
         for ( int i = 0; i < cs.length; i++ ) {
             char c = cs[i];
             switch ( c ) {

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-07-20 17:34:46 UTC (rev 13680)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-07-20 17:51:32 UTC (rev 13681)
@@ -16,7 +16,6 @@
 import org.drools.common.InternalFactHandle;
 import org.drools.common.PropagationContextImpl;
 import org.drools.compiler.DialectConfiguration;
-import org.drools.compiler.DialectRegistry;
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.lang.descr.RuleDescr;
@@ -189,5 +188,9 @@
         assertEquals( "foo [\n bar \n];\nbar;  x;\nyeah();\nman[42];\nbaby;ca chiga;\nend",
                       cons.delimitExpressions( ex ) );
 
+        ex = "   \n\nfoo [\n bar \n]\n\n\nbar;  x\n  \nyeah();\nman[42]\nbaby;ca chiga;\nend";
+        assertEquals( "   \n\nfoo [\n bar \n];\n\n\nbar;  x;\n  \nyeah();\nman[42];\nbaby;ca chiga;\nend",
+                      cons.delimitExpressions( ex ) );
+
     }
 }