Mixin only once. Set flag to true once mixed

Joyce Chen · Di Wu · commit ef951a9b96cb · 2013-06-05T21:50:11.000-07:00
diff --git a/lib/column.js b/lib/column.js
@@ -24,6 +24,7 @@ var Column = function(config) {
   // mixin only once.  This is to avoid circular dependency in
   // CommonJS.
   if (!valueExpressionMixed) {
+    valueExpressionMixed = true;
     _.extend(Column.prototype, ValueExpressionMixin());
   }
 };
diff --git a/lib/node/binary.js b/lib/node/binary.js
@@ -16,6 +16,7 @@ var BinaryNode = Node.define(_.extend({
     // mixin only once.  This is to avoid circular dependency in
     // CommonJS.
     if (!valueExpressionMixed) {
+      valueExpressionMixed = true;
       _.extend(BinaryNode.prototype, ValueExpressionMixin());
     }
   },
diff --git a/lib/node/unary.js b/lib/node/unary.js
@@ -15,6 +15,7 @@ var UnaryNode = module.exports = Node.define({
     // mixin only once.  This is to avoid circular dependency in
     // CommonJS.
     if (!valueExpressionMixed) {
+      valueExpressionMixed = true;
       _.extend(UnaryNode.prototype, ValueExpressionMixin());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ var Column = function(config) {`
`24`	`24`	`// mixin only once. This is to avoid circular dependency in`
`25`	`25`	`// CommonJS.`
`26`	`26`	`if (!valueExpressionMixed) {`
	`27`	`+ valueExpressionMixed = true;`
`27`	`28`	`_.extend(Column.prototype, ValueExpressionMixin());`
`28`	`29`	`}`
`29`	`30`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ var BinaryNode = Node.define(_.extend({`
`16`	`16`	`// mixin only once. This is to avoid circular dependency in`
`17`	`17`	`// CommonJS.`
`18`	`18`	`if (!valueExpressionMixed) {`
	`19`	`+ valueExpressionMixed = true;`
`19`	`20`	`_.extend(BinaryNode.prototype, ValueExpressionMixin());`
`20`	`21`	`}`
`21`	`22`	`},`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ var UnaryNode = module.exports = Node.define({`
`15`	`15`	`// mixin only once. This is to avoid circular dependency in`
`16`	`16`	`// CommonJS.`
`17`	`17`	`if (!valueExpressionMixed) {`
	`18`	`+ valueExpressionMixed = true;`
`18`	`19`	`_.extend(UnaryNode.prototype, ValueExpressionMixin());`
`19`	`20`	`}`
`20`	`21`	`}`