fixed while/for brackets!!! note: needs a serious refactoring

notwaldorf · Apr 10, 2012 · 044c9f7 · 044c9f7
1 parent 888ccb5
commit 044c9f7
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 21 deletions.
diff --git a/evaligator.coffee b/evaligator.coffee
@@ -140,20 +140,27 @@ class SourceCodeParser
     @transmogrifier.loopDeclaration node.lineNumber
     @BLOCK_MODE_GO = true
 
+    # if we don't have a block (i.e with brackets), then according to the grammar we have a statement
     if blockNode = @getAllNodesOfType(node, "Block")?[0]
-      blockSource = blockNode.source
-      blockLocation = blockNode.range.location
-      if needsBlockifying = blockSource.substr(blockLocation, blockNode.range.length).indexOf('\n') is -1
-        @transmogrifier.pseudoBlockifyStart blockNode.lineNumber, node.range.location, blockSource
+      needsBlockifying = false || (blockNode.lineNumber != node.lineNumber) # on next line needs bracketing too
+    else 
+      blockNode = @getAllNodesOfType(node, "Statement")?[0] # unbracketed
+      needsBlockifying = true
 
-      for identifierName in identifierNames || []
-        @assignValue node.lineNumber, identifierName, node.lineNumber
+    blockSource = blockNode.source
+    blockLocation = blockNode.range.location
+
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyStart blockNode.lineNumber
 
-      @transmogrifier.bubbleWrapThisLoop blockNode.lineNumber # prevent infinite loops if needed
-      @recursivelyTransmogrifyAllTheThings blockNode if blockNode
+    for identifierName in identifierNames || []
+      @assignValue node.lineNumber, identifierName, node.lineNumber
+
+    @transmogrifier.bubbleWrapThisLoop blockNode.lineNumber # prevent infinite loops if needed
+    @recursivelyTransmogrifyAllTheThings blockNode if blockNode
 
-      if needsBlockifying
-        @transmogrifier.pseudoBlockifyEnd blockNode.lineNumber
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyEnd blockNode.lineNumber
 
     @BLOCK_MODE_GO = false
 
@@ -167,10 +174,29 @@ class SourceCodeParser
     @transmogrifier.loopDeclaration node.lineNumber
 
     @BLOCK_MODE_GO = true
-    @transmogrifier.bubbleWrapThisLoop node.lineNumber # prevent infinite loops if needed
+    # if we don't have a block (i.e with brackets), then according to the grammar we have a statement
+    # if we don't have a block (i.e with brackets), then according to the grammar we have a statement
+    if blockNode = @getAllNodesOfType(node, "Block")?[0]
+      needsBlockifying = false || (blockNode.lineNumber != node.lineNumber) # on next line needs bracketing too
+    else 
+      blockNode = @getAllNodesOfType(node, "Statement")?[0] # unbracketed
+      needsBlockifying = true
+
+
+    blockSource = blockNode.source
+    blockLocation = blockNode.range.location
+
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyStart blockNode.lineNumber
+
     @assignValue node.lineNumber, identifierNames[0] if expressionNode?[0]
-    blockNode = @getAllNodesOfType(node, "Block")?[0]
-    @recursivelyTransmogrifyAllTheThings blockNode
+
+    @transmogrifier.bubbleWrapThisLoop node.lineNumber # prevent infinite loops if needed
+    @recursivelyTransmogrifyAllTheThings blockNode if blockNode
+
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyEnd blockNode.lineNumber
+
     @BLOCK_MODE_GO = false
 
   transmogrifyDoWhileStatement: (node) ->
@@ -182,10 +208,29 @@ class SourceCodeParser
     @transmogrifier.loopDeclaration node.lineNumber
 
     @BLOCK_MODE_GO = true
-    @transmogrifier.bubbleWrapThisLoop node.lineNumber # prevent infinite loops if needed
+    # if we don't have a block (i.e with brackets), then according to the grammar we have a statement
+    # if we don't have a block (i.e with brackets), then according to the grammar we have a statement
+    if blockNode = @getAllNodesOfType(node, "Block")?[0]
+      needsBlockifying = false || (blockNode.lineNumber != node.lineNumber) # on next line needs bracketing too
+    else 
+      blockNode = @getAllNodesOfType(node, "Statement")?[0] # unbracketed
+      needsBlockifying = true
+
+
+    blockSource = blockNode.source
+    blockLocation = blockNode.range.location
+
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyStart blockNode.lineNumber
+
     @assignValue node.lineNumber, identifierNames[0] if expressionNode?[0]
-    blockNode = @getAllNodesOfType(node, "Block")?[0]
-    @recursivelyTransmogrifyAllTheThings blockNode
+
+    @transmogrifier.bubbleWrapThisLoop node.lineNumber # prevent infinite loops if needed
+    @recursivelyTransmogrifyAllTheThings blockNode if blockNode
+
+    if needsBlockifying
+      @transmogrifier.pseudoBlockifyEnd blockNode.lineNumber
+
     @BLOCK_MODE_GO = false
 
   transmogrifyIfStatement: (node) ->
@@ -351,10 +396,8 @@ class SourceTransmogrifier
       winningVariableMap = @variableMap
 
   pseudoBlockifyStart: (lineNumber) ->
-    index = @source[lineNumber].indexOf('{')
-    console.log index
-    @source[lineNumber] = "#{@source[lineNumber].substr(0, index - 1)}\n{/* AUTO BRACKET */#{@source[lineNumber].substr(index)}\n"
-
+    @source[lineNumber-1] = "#{@source[lineNumber-1]} {/* AUTO BRACKET */\n"
+
   pseudoBlockifyEnd: (lineNumber) ->
     @source[lineNumber] += "\n/* END AUTO BRACKET */}"
 
@@ -368,7 +411,7 @@ class SourceTransmogrifier
 
   bubbleWrapThisLoop: (lineNumber) ->
     if @useProtection
-      @source[lineNumber] += "if (++(__INF_LOOP_BUBBLE_WRAP__[#{@numLoopsWrapped}]) > #{maxProtectedIterations}){ break; }"
+      @source[lineNumber] += ";if (++(__INF_LOOP_BUBBLE_WRAP__[#{@numLoopsWrapped}]) > #{maxProtectedIterations}){ break; }"
       ++@numLoopsWrapped  # we've protected this loop, ready for the next one!
 
   iterationAssignment: (lineNumber, variableName, displayLineNumber=lineNumber) ->

diff --git a/test/test.coffee b/test/test.coffee
@@ -383,6 +383,7 @@ test "for brackets, part 2", ->
   array = [1, 3, '4']
   b = 0
   i = 0 | 1 | 2 ; count = 3 | 3 | 3
+  
   b = '1!' | '3!' | '4!'
   """
   allIsGood = monkey.parseThemSourceCodes(longCodeString)