Merge pull request #349 from ef4/fix-duplicate-vars

Fix duplicate vars at top level
michaelficarra · May 28, 2015 · 1de9cf2 · 1de9cf2
2 parents 7a2eabe + b0785ca
commit 1de9cf2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 22 deletions.
diff --git a/lib/cli.js b/lib/cli.js
diff --git a/lib/compiler.js b/lib/compiler.js
diff --git a/lib/js-nodes.js b/lib/js-nodes.js
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/compiler.coffee b/src/compiler.coffee
@@ -134,8 +134,8 @@ generateMutatingWalker = (fn) -> (node, args...) ->
 
 declarationsNeeded = (node) ->
  return [] unless node?
- if (node.instanceof JS.AssignmentExpression) and node.operator is '=' and node.left.instanceof JS.Identifier then [node.left]
- else if (node.instanceof JS.ForInStatement) and node.left.instanceof JS.Identifier then [node.left]
+ if (node.instanceof JS.AssignmentExpression) and node.operator is '=' and node.left.instanceof JS.Identifier then [node.left.name]
+ else if (node.instanceof JS.ForInStatement) and node.left.instanceof JS.Identifier then [node.left.name]
  else []
 
 declarationsNeededRecursive = (node) ->
@@ -415,7 +415,7 @@ class exports.Compiler
  decls = nub concatMap block, declarationsNeededRecursive
  if decls.length > 0
  if options.bare
- block.unshift makeVarDeclaration decls
+ block.unshift makeVarDeclaration decls.map (name) -> new JS.Identifier(name)
  else
  # add a function wrapper
  block = [stmt new JS.UnaryExpression 'void', new JS.CallExpression (memberAccess (new JS.FunctionExpression null, [], new JS.BlockStatement block), 'call'), [new JS.ThisExpression]]
@@ -1095,7 +1095,7 @@ class exports.Compiler
 
  # TODO: comments
  generateMutatingWalker (state) ->
- state.declaredSymbols = union state.declaredSymbols, map (declarationsNeeded this), (id) -> id.name
+ state.declaredSymbols = union state.declaredSymbols, declarationsNeeded this
  {declaredSymbols, usedSymbols, nsCounters} = state
  newNode = if @instanceof JS.GenSym
  newNode = new JS.Identifier generateName this, state
@@ -1110,15 +1110,15 @@ class exports.Compiler
  usedSymbols: union usedSymbols, params
  nsCounters: nsCounters_
  newNode.body = forceBlock newNode.body
- undeclared = map (declarationsNeededRecursive @body), (id) -> id.name
+ undeclared = declarationsNeededRecursive @body
  undeclared = difference undeclared, map (variableDeclarations @body), (id) -> id.name
  alreadyDeclared = union declaredSymbols, concatMap @params, collectIdentifiers
  declNames = nub difference undeclared, alreadyDeclared
  decls = map declNames, (name) -> new JS.Identifier name
  newNode.body.body.unshift makeVarDeclaration decls if decls.length > 0
  newNode
  else generateSymbols this, state
- state.declaredSymbols = union declaredSymbols, map (declarationsNeededRecursive newNode), (id) -> id.name
+ state.declaredSymbols = union declaredSymbols, declarationsNeededRecursive newNode
  newNode
 
  defaultRule = ->