svn commit: r1401214 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java

[davsclaus]

Author: davsclaus
Date: Tue Oct 23 09:21:18 2012
New Revision: 1401214

URL: http://svn.apache.org/viewvc?rev=1401214&view=rev
Log:
CAMEL-5736: Simple language - Unary operators should be more lenient and only 
be applicable if previous node is a function expression

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1401209
  Merged /camel/branches/camel-2.10.x:r1401210

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java?rev=1401214&r1=1401213&r2=1401214&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
 Tue Oct 23 09:21:18 2012
@@ -147,7 +147,10 @@ public class SimpleExpressionParser exte
             functions.decrementAndGet();
             return new SimpleFunctionEnd(token);
         } else if (token.getType().isUnary()) {
-            return new UnaryExpression(token);
+            // there must be a end function as previous, to let this be a 
unary function
+            if (!nodes.isEmpty() && nodes.get(nodes.size() - 1) instanceof 
SimpleFunctionEnd) {
+                return new UnaryExpression(token);
+            }
         }
 
         // by returning null, we will let the parser determine what to do

Modified: 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java?rev=1401214&r1=1401213&r2=1401214&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
 Tue Oct 23 09:21:18 2012
@@ -458,6 +458,24 @@ public class SimpleOperatorTest extends 
         }
     }
 
+    public void testUnaryInc() throws Exception {
+        assertExpression("${in.header.bar}++", 124);
+        assertExpression("+++++++++++++", "+++++++++++++");
+        assertExpression("Logging ++ start ++", "Logging ++ start ++");
+        assertExpression("Logging +++ start +++", "Logging +++ start +++");
+        assertExpression("++ start ++", "++ start ++");
+        assertExpression("+++ start +++", "+++ start +++");
+    }
+
+    public void testUnaryDec() throws Exception {
+        assertExpression("${in.header.bar}--", 122);
+        assertExpression("-------------", "-------------");
+        assertExpression("Logging -- start --", "Logging -- start --");
+        assertExpression("Logging --- start ---", "Logging --- start ---");
+        assertExpression("-- start --", "-- start --");
+        assertExpression("--- start ---", "--- start ---");
+    }
+
     protected String getLanguageName() {
         return "simple";
     }