-jashkenas#558 beginning of work to support 1-1 line matching

hbt · Dec 25, 2011 · 0069c6d · 0069c6d
1 parent 6a99b26
commit 0069c6d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
@@ -48,8 +48,8 @@ exports.postCompilationMatchLines = (code) ->
       continue
 
     # skip line after /*line -- comment
-    if line is "*/" && newLines[curLine] is ""
-      continue
+    if line.indexOf("*/") is 0 && newLines[curLine] is ""
+      line = line.substring(2)
 
     newLines[curLine] += line
 

diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -77,31 +77,42 @@ exports.Lexer = class Lexer
       blocks = flatten blocks
 
       lastToken = null
+      lineBlocks = ['INDENT']
       tmp = []
+      lastTokenHadNewLine = false
 
       for t in @tokens
         tmp.push t
-        # TODO: improve to handle "newLine" attribute. Careful with indentation errors 
 
-        if t[0] == 'TERMINATOR' 
+        lastTokenHadNewLine = true if lastToken and lastToken.newLine and lastToken[0] isnt 'TERMINATOR'
+
+        lastTokenLineNumber = lastToken[2] if lastTokenHadNewLine
+
+        if t[0] is 'TERMINATOR' or (t[0] in lineBlocks and lastTokenHadNewLine)
+          lastTokenHadNewLine = false if t[0] is 'TERMINATOR'
           line = 'line '
           lineNumber = t[2]
           if lastToken
             lineNumber = lastToken[2]
 
+          if lastTokenHadNewLine
+            lineNumber = lastTokenLineNumber
+
           line += lineNumber+1
 
           # push comment with line number
           res.push ['HERECOMMENT', line, lineNumber]
-
-          res.push t
+          res.push ['TERMINATOR', "\n", lineNumber]
 
           # push tokens (actual source code)
           res.push tm for tm in tmp
 
           # reset
           line = ''
           tmp = []
+          lastTokenHadNewLine = false
+          lastToken = null
+
 
         if t[0] not in blocks
           lastToken = t