issue #58 : invNeedsTmpVar(Invocation inv) returned false positives

VRL-Studio · Aug 7, 2015 · 10a9447 · 10a9447
1 parent b736b86
commit 10a9447
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/VRL/VRL-Lang/src/main/java/eu/mihosoft/vrl/lang/model/transform/InstrumentCode.java b/VRL/VRL-Lang/src/main/java/eu/mihosoft/vrl/lang/model/transform/InstrumentCode.java
@@ -17,6 +17,7 @@
 import eu.mihosoft.vrl.lang.model.Invocation;
 import eu.mihosoft.vrl.lang.model.MethodDeclaration;
 import eu.mihosoft.vrl.lang.model.Operator;
+import eu.mihosoft.vrl.lang.model.ReturnStatementInvocation;
 import eu.mihosoft.vrl.lang.model.Scope;
 import eu.mihosoft.vrl.lang.model.ScopeInvocation;
 import eu.mihosoft.vrl.lang.model.Type;
@@ -164,9 +165,13 @@ private boolean invNeedsTmpVar(Invocation inv) {
         if (inv instanceof DeclarationInvocation) {
             return false;
         }
+
+        if (inv instanceof ReturnStatementInvocation) {
+            return false;
+        }
 
         if (!(inv instanceof BinaryOperatorInvocationImpl)) {
-            return false;
+            return true;
         }
 
         BinaryOperatorInvocationImpl boi = (BinaryOperatorInvocationImpl) inv;