change NullCheckCallExpression consequent to ast.CallExpression

alongubkin · Nov 14, 2014 · 8f68c49 · 8f68c49
1 parent c724daa
commit 8f68c49
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/lib/ast/expressions/CallExpression.js b/lib/ast/expressions/CallExpression.js
@@ -21,9 +21,15 @@ exports.CallExpression = function (callee, args) {
 exports.CallExpression.prototype = Object.create(Node);
 
 exports.CallExpression.prototype.codegen = function () {
+  if (!Node.prototype.codegen.call(this)) {
+    return;
+  }
+
   var calleeType = this.callee.type;  
 
-  this.callee = this.callee.codegen();
+  if (!this.callee.codeGenerated) {
+    this.callee = this.callee.codegen();
+  }
 
   var args = this.arguments;
   args.forEach(function (arg, i) {

diff --git a/lib/ast/expressions/NullCheckCallExpression.js b/lib/ast/expressions/NullCheckCallExpression.js
@@ -1,5 +1,6 @@
-var Node = require('../Node').Node;
-
+var Node = require('../Node').Node,
+    CallExpression = require('./CallExpression').CallExpression;
+
 exports.NullCheckCallExpression = function (callee, args) {
   var self = this;
   Node.call(self);
@@ -18,14 +19,19 @@ exports.NullCheckCallExpression = function (callee, args) {
 
 exports.NullCheckCallExpression.prototype = Object.create(Node);
 
-exports.NullCheckCallExpression.prototype.codegen = function () { 
+exports.NullCheckCallExpression.prototype.codegen = function () {
+  if (!Node.prototype.codegen.call(this)) {
+    return;
+  }
+
   var calleeType = this.callee.type;
 
   this.callee = this.callee.codegen();
 
   var args = this.args;
   args.forEach(function (arg, i) {
     args[i] = arg.codegen();
+    args[i].codeGenerated = true;
   });
 
   // If the callee has a function call (e.g: a().b)
@@ -36,7 +42,8 @@ exports.NullCheckCallExpression.prototype.codegen = function () {
 
     var id = {
       "type": "Identifier",
-      "name": exports.NullCheckCallExpression.getNextVariableName()    
+      "name": exports.NullCheckCallExpression.getNextVariableName(),
+      "codeGenerated": true
     };
 
     context.node.body.splice(context.position + 
@@ -89,11 +96,8 @@ exports.NullCheckCallExpression.prototype.codegen = function () {
     };
   } 
 
-  var consequent = {
-    "type": "CallExpression",
-    "callee": argument,
-    "arguments": args
-  };
+  argument.codeGenerated = true;
+  var consequent = new CallExpression(argument, args).codegen();
 
   if (this.parent.type === 'ExpressionStatement') {
     this.parent.type = 'IfStatement';