From ae54f34f25ce08a2abc5ee9a162292940d256c84 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 26 Sep 2015 11:30:35 +0200
Subject: [PATCH] removed a redundant else and made unary + work also in the
 console

---
 components/compiler/exprparser.cpp | 6 ++++--
 components/compiler/lineparser.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 53b24eab6..c0375b436 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -650,13 +650,15 @@ namespace Compiler
             mOperators.push_back ('m');
             mTokenLoc = loc;
             return true;
-        } else if (code ==Scanner::S_plus && mNextOperand) {
+        }
+
+        if (code ==Scanner::S_plus && mNextOperand)
+        {
             // Also unary, but +, just ignore it
             mTokenLoc = loc;
             return true;
         }
 
-
         if (code==Scanner::S_open)
         {
             if (mNextOperand)
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 032af7d65..c1622c3e0 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -555,7 +555,7 @@ namespace Compiler
         }
 
         if (mAllowExpression && mState==BeginState &&
-            (code==Scanner::S_open || code==Scanner::S_minus))
+            (code==Scanner::S_open || code==Scanner::S_minus || code==Scanner::S_plus))
         {
             scanner.putbackSpecial (code, loc);
             parseExpression (scanner, loc);