[jboss-svn-commits] JBL Code SVN: r34934 - in labs/jbossrules/trunk/drools-clips/src/main/java/org/drools: clips/functions and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 30 16:54:02 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-08-30 16:54:01 -0400 (Mon, 30 Aug 2010)
New Revision: 34934
Modified:
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionHandlers.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/BindFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/CallFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/IfFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ModifyFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/NewFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrintoutFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrognFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ReturnFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SetFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SwitchFunction.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsConsequenceBuilder.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java
labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java
Log:
-Fixed failing tests, due to MVEL being more strict on rogue characters, such as ;
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -377,7 +377,8 @@
List list = (List) functionDescr.getContent();
for ( Iterator it = list.iterator(); it.hasNext(); ) {
FunctionHandlers.dump( (LispForm) it.next(),
- builder );
+ builder,
+ true );
}
builder.append( "}" );
@@ -393,7 +394,8 @@
public void lispFormHandler(LispForm lispForm) {
StringBuilderAppendable appendable = new StringBuilderAppendable();
FunctionHandlers.dump( lispForm,
- appendable );
+ appendable,
+ true );
ParserContext context = new ParserContext();
@@ -436,6 +438,8 @@
ClassLoader tempClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( ((InternalRuleBase)ruleBase).getRootClassLoader() );
+ System.out.println( "mvel expr:" + appendable.toString() );
+
ExpressionCompiler expr = new ExpressionCompiler( appendable.toString() );
Serializable executable = expr.compile( context );
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionHandlers.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionHandlers.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/FunctionHandlers.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -42,8 +42,12 @@
public void registerFunction(Function function) {
this.map.put( function.getName(), function );
}
-
- public static void dump(SExpression sExpression, Appendable appendable) {
+ public static void dump(SExpression sExpression, Appendable appendable) {
+ dump(sExpression,
+ appendable,
+ false);
+ }
+ public static void dump(SExpression sExpression, Appendable appendable, boolean root) {
if ( sExpression instanceof LispAtom ) {
appendable.append( ( ( LispAtom ) sExpression).getValue() );
} else {
@@ -60,14 +64,17 @@
// execute as user function
appendable.append( functionName + "(" );
for ( int i = 1, length = form.getSExpressions().length; i < length; i++ ) {
- dump( form.getSExpressions()[i], appendable );
+ dump( form.getSExpressions()[i], appendable, false );
if ( i < length -1 ) {
appendable.append( ", " );
}
}
appendable.append( ")" );
}
- }
+ }
+ if ( root ) {
+ appendable.append( ";\n" );
+ }
}
public static FunctionDescr createFunctionDescr(SExpression name, LispForm params, List<SExpression> content) {
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/AssertFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -49,6 +49,6 @@
appendable.append( "," );
}
}
- appendable.append("} );\n");
+ appendable.append("} )");
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/BindFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/BindFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/BindFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -35,6 +35,5 @@
appendable.append(( (LispAtom) lispForm.getSExpressions()[1]).getValue() + " = " );
FunctionHandlers.dump( lispForm.getSExpressions()[2], appendable);
- appendable.append(";\n");
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/CallFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/CallFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/CallFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -58,6 +58,6 @@
appendable.append( ", " );
}
}
- appendable.append( ");" );
+ appendable.append( ")" );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/IfFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/IfFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/IfFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -45,7 +45,7 @@
i++;
break;
}
- FunctionHandlers.dump( sExpressions[i], appendable );
+ FunctionHandlers.dump( sExpressions[i], appendable, true );
}
appendable.append( "}" );
@@ -58,7 +58,7 @@
i++;
break;
}
- FunctionHandlers.dump( sExpressions[i], appendable );
+ FunctionHandlers.dump( sExpressions[i], appendable, true );
}
appendable.append( "}" );
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ModifyFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ModifyFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ModifyFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -47,6 +47,6 @@
appendable.append( "," );
}
}
- appendable.append("};");
+ appendable.append("}");
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/NewFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/NewFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/NewFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -46,6 +46,6 @@
appendable.append( ", " );
}
}
- appendable.append( ");" );
+ appendable.append( ")" );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrintoutFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrintoutFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrintoutFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -43,6 +43,6 @@
appendable.append( "+" );
}
}
- appendable.append( ");" );
+ appendable.append( ")" );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrognFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrognFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/PrognFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -46,7 +46,7 @@
appendable.append( " ) {" );
for ( int i = 2, length = sExpressions.length; i < length; i++ ) {
- FunctionHandlers.dump( sExpressions[i], appendable );
+ FunctionHandlers.dump( sExpressions[i], appendable, true );
}
appendable.append( "}" );
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RetractFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -33,6 +33,6 @@
String var = ((LispAtom) form.getSExpressions()[0]).getValue();
- appendable.append("retract( " + var + " );\n");
+ appendable.append("retract( " + var + " )");
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ReturnFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ReturnFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/ReturnFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -31,6 +31,5 @@
public void dump(LispForm lispForm, Appendable appendable) {
appendable.append( "return " );
FunctionHandlers.dump( lispForm.getSExpressions()[1], appendable );
- appendable.append( ";\n" );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/RunFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -32,7 +32,7 @@
if ( lispForm.getSExpressions().length == 3 ) {
appendable.append( "run(" + ((LispAtom)lispForm.getSExpressions()[2]).getValue() + ");\n " );
} else {
- appendable.append( "run();\n " );
+ appendable.append( "run()" );
}
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SetFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SetFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SetFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -48,7 +48,5 @@
FunctionHandlers.dump( sExpressions[3],
appendable );
-
- appendable.append( ";\n" );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SwitchFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SwitchFunction.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/clips/functions/SwitchFunction.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -49,7 +49,7 @@
FunctionHandlers.dump( caseForm.getSExpressions()[1], appendable );
appendable.append( ") {" );
for ( int j = 3, jlength = caseForm.getSExpressions().length; j < jlength; j++ ) {
- FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable );
+ FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable, true );
}
appendable.append( "}" );
@@ -61,7 +61,7 @@
appendable.append( ") {" );
for ( int j = 3, jlength = caseForm.getSExpressions().length; j < jlength; j++ ) {
- FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable );
+ FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable, true );
}
appendable.append( "}" );
}
@@ -72,16 +72,16 @@
FunctionHandlers.dump( caseForm.getSExpressions()[1], appendable );
appendable.append( ") {" );
for ( int j = 3, length = caseForm.getSExpressions().length; j < length; j++ ) {
- FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable );
+ FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable, true );
}
appendable.append( "}" );
} else {
appendable.append( " else { " );
for ( int j = 1, length = caseForm.getSExpressions().length; j < length; j++ ) {
- FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable );
+ FunctionHandlers.dump( caseForm.getSExpressions()[j], appendable, true );
}
appendable.append( "}" );
- }
+ }
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsConsequenceBuilder.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsConsequenceBuilder.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -35,7 +35,8 @@
List list = (List) context.getRuleDescr().getConsequence();
for ( Iterator it = list.iterator(); it.hasNext(); ) {
FunctionHandlers.dump( (LispForm) it.next(),
- builder );
+ builder,
+ true );
}
context.getRuleDescr().setConsequence( builder.toString() );
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsDialect.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -163,7 +163,8 @@
PredicateDescr pdescr = (PredicateDescr) descr;
if ( pdescr.getContent() instanceof LispForm ) {
FunctionHandlers.dump( (LispForm) pdescr.getContent(),
- builder );
+ builder,
+ true);
content = builder.toString();
pdescr.setContent( content );
@@ -173,7 +174,8 @@
ReturnValueRestrictionDescr rdescr = (ReturnValueRestrictionDescr) descr;
if ( rdescr.getContent() instanceof LispForm ) {
FunctionHandlers.dump( (LispForm) rdescr.getContent(),
- builder );
+ builder,
+ true);
content = builder.toString();
rdescr.setContent( content );
}
Modified: labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java 2010-08-30 19:14:49 UTC (rev 34933)
+++ labs/jbossrules/trunk/drools-clips/src/main/java/org/drools/rule/builder/dialect/clips/ClipsEvalBuilder.java 2010-08-30 20:54:01 UTC (rev 34934)
@@ -59,7 +59,8 @@
Appendable builder = new StringBuilderAppendable();
EvalDescr edescr = (EvalDescr) descr;
FunctionHandlers.dump( (LispForm) edescr.getContent(),
- builder );
+ builder,
+ true );
edescr.setContent( builder.toString() );
return super.build(context, descr, prefixPattern);
}
More information about the jboss-svn-commits
mailing list