From 483bd16a2d0ef95dc612c539bfd4e7be0488cf8c Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@slevenbits.com>
Date: Sun, 10 Mar 2013 17:37:44 +0000
Subject: [PATCH] Formatting: simplify code slightly.

---
 Objective-J/ObjJAcornCompiler.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Objective-J/ObjJAcornCompiler.js b/Objective-J/ObjJAcornCompiler.js
index f2861194d..6c8fc4a1b 100644
--- a/Objective-J/ObjJAcornCompiler.js
+++ b/Objective-J/ObjJAcornCompiler.js
@@ -398,12 +398,17 @@ function isIdempotentExpression(node) {
         case "Reference":
             return isIdempotentExpression(node.element);
 
-        case "UpdateExpression":
         default:
             return false;
     }
 }
 
+// We do not allow dereferencing of expressions with side effects because we might need to evaluate the expression twice in certain uses of deref, which is not obvious when you look at the deref operator in plain code.
+function checkCanDereference(st, node) {
+    if (!isIdempotentExpression(node))
+        throw st.compiler.error_message("Dereference of expression with side effects", node);
+}
+
 var pass1 = exports.acorn.walk.make({
 ImportStatement: function(node, st, c) {
     var urlString = node.filename.value;
@@ -475,8 +480,7 @@ VariableDeclaration: function(node, scope, c) {
 },
 AssignmentExpression: function(node, st, c) {
     if (node.left.type === "Dereference") {
-        if (!isIdempotentExpression(node.left))
-            throw st.compiler.error_message("Unable to dereference expression with side effects", node.left);
+        checkCanDereference(st, node.left);
 
         // @deref(x) = z    -> x(z) etc
         CONCAT(st.compiler.jsBuffer, st.compiler.source.substring(st.compiler.lastPos, node.start));
@@ -518,8 +522,7 @@ AssignmentExpression: function(node, st, c) {
 },
 UpdateExpression: function(node, st, c) {
     if (node.argument.type === "Dereference") {
-        if (!isIdempotentExpression(node.argument))
-            throw st.compiler.error_message("Unable to dereference expression with side effects", node.argument);
+        checkCanDereference(st, node.argument);
 
         // @deref(x)++ and ++@deref(x) require special handling.
         CONCAT(st.compiler.jsBuffer, st.compiler.source.substring(st.compiler.lastPos, node.start));
@@ -974,8 +977,7 @@ Reference: function(node, st, c) {
     st.compiler.lastPos = node.end;
 },
 Dereference: function(node, st, c) {
-    if (!isIdempotentExpression(node.expr))
-        throw st.compiler.error_message("Unable to dereference expression with side effects", node.expr);
+    checkCanDereference(st, node.expr);
 
     // @deref(y) -> y()
     // @deref(@deref(y)) -> y()()