FIX: comment-like lines inside a string-block

CHANGE: going back to picky-comments, since my preprocessor was pretty wrong sometimes. Now things are all correct, just over picky. HOWEVER - I did fix the biggest problem previously with pick comments. An indented comment after a statement no longer converts it into a funciton invocation. ALL TESTS PASS
caffeine-suite · Sep 6, 2018 · 16db9e0 · 16db9e0
1 parent a0d2aca
commit 16db9e0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 20 deletions.
diff --git a/cafInCaf/CaffeineScript/Preprocessors.caf b/cafInCaf/CaffeineScript/Preprocessors.caf
@@ -106,4 +106,6 @@ class Preprocessors
       source
 
   @preprocess: (source) =>
-    @normalizeComments @normalizeIndentation source
+    # DISABLED - this needs to be applied at the block level
+    # @normalizeComments
+    @normalizeIndentation source
diff --git a/cafInCaf/CaffeineScript/Rules/Comments.caf b/cafInCaf/CaffeineScript/Rules/Comments.caf
@@ -9,18 +9,28 @@ import &StandardImport
       {} pattern: "/##[^\n]*/ unparsedBlock*"
       {} pattern: /\ *#([^\n$\w\u007f-\uffff]+[^\n]*|(?=\n|$))/
 
+    ##
+      Statement-ends are:
+        new-line          "\n"
+        end-of-buffer     ($)
+        semi-column       ";"
+        close-parenthesis ")"
+
+      NOTE:   A close-parenthesis can be considered an 'end'
+      WHY?    It's needed to make this parse: (-> 1)
+              Without it, the "1" wouldn't be a statement.
+      NOTE:   The close-paren is not 'consumed' by this regexp.
+
     _end:
       ///
         (\ * (\n | ;\ * | $) )+
         |
         (\ * (?=\)))
-        # A close-parenthesis can be considered an 'end'
-        # This is makes this parse: (-> 1).
-        # Without it, the "1" wouldn't be a statement.
-        # NOTE: the close-paren is not 'consumed' by this regexp.
 
     lineStartComment: "comment _end" "_end"
     lineEndComment:   "_? comment? _end lineStartComment*"
 
     # commenting this out breacks compiling: LiteralStrings.caf
     {} getPresent: ~> false
+
+    onlyCommentsRemain: "lineEndComment /$/"
diff --git a/cafInCaf/CaffeineScript/Rules/RegExp.caf b/cafInCaf/CaffeineScript/Rules/RegExp.caf
@@ -60,8 +60,8 @@ multilineRegExpEscape:
 
 multilineRegExpComment:
   pattern:    "/^|\\n|\\s/ comment" #/(^|\n|\s)+#(?!\{)[^\n]+[\s\n]*/
-  stnFactory: :StringStn
+  # stnFactory: :StringStn
-  stnProps:   ~> value: ""
+  # stnProps:   ~> value: ""
 
 multilineRegExpInterpolation:
   pattern: "/ */ interpolationStart expression interpolationEnd"

diff --git a/cafInCaf/CaffeineScript/Rules/ValueLists.caf b/cafInCaf/CaffeineScript/Rules/ValueLists.caf
@@ -6,7 +6,7 @@ import &StandardImport, &CaffeineEight
 
   @rule
     valueListBlock:         Extensions.IndentBlocks.getPropsToSubparseBlock rule: "valueListBlockSubParse"
-    valueListBlockSubParse: "end* listItemStatement*"
+    valueListBlockSubParse: "end* listItemStatement+"
 
   @rule
     simpleValueList:

diff --git a/source/CaffeineScript/Preprocessors.js b/source/CaffeineScript/Preprocessors.js
@@ -149,8 +149,7 @@ Caf.defMod(module, () => {
                 lines.join("\n"))
               : source;
           };
-          this.preprocess = source =>
+          this.preprocess = source => this.normalizeIndentation(source);
-            this.normalizeComments(this.normalizeIndentation(source));
         }
       ));
     }

diff --git a/source/CaffeineScript/Rules/Comments.js b/source/CaffeineScript/Rules/Comments.js
@@ -19,7 +19,8 @@ Caf.defMod(module, () => {
           getPresent: function() {
             return false;
           }
-        }
+        },
+        { onlyCommentsRemain: "lineEndComment /$/" }
       );
     };
   })();

diff --git a/source/CaffeineScript/Rules/RegExp.js b/source/CaffeineScript/Rules/RegExp.js
@@ -65,13 +65,7 @@ Caf.defMod(module, () => {
             return { value: this.text === "\\ " ? " " : this.text };
           }
         },
-        multilineRegExpComment: {
+        multilineRegExpComment: { pattern: "/^|\\n|\\s/ comment" },
-          pattern: "/^|\\n|\\s/ comment",
-          stnFactory: "StringStn",
-          stnProps: function() {
-            return { value: "" };
-          }
-        },
         multilineRegExpInterpolation: {
           pattern: "/ */ interpolationStart expression interpolationEnd"
         },

diff --git a/source/CaffeineScript/Rules/ValueLists.js b/source/CaffeineScript/Rules/ValueLists.js
@@ -11,7 +11,7 @@ Caf.defMod(module, () => {
           valueListBlock: Extensions.IndentBlocks.getPropsToSubparseBlock({
             rule: "valueListBlockSubParse"
           }),
-          valueListBlockSubParse: "end* listItemStatement*"
+          valueListBlockSubParse: "end* listItemStatement+"
         });
         this.rule({
           simpleValueList: [

diff --git a/test/tests/CaffeineScript/Parser/Literals/StringLiterals.coffee b/test/tests/CaffeineScript/Parser/Literals/StringLiterals.coffee
@@ -392,6 +392,11 @@ module.exports = suite: parseTestSuite
             thing.
           ''': '`This\\nthat and the ${Caf.toString(b)}\\nthing.`;'
 
+    regressions:
+      """
+      ""
+        # looks like a comment but its not
+      """: '"# looks like a comment but its not";'
   interpolated:
     basic:
       '"${#{foo}}"':                     '`\\${${Caf.toString(foo)}}`;'
@@ -413,4 +418,5 @@ module.exports = suite: parseTestSuite
         1
         2
       }there"
-      """: "`hi${Caf.toString([1, 2])}there`;"
+      """: "`hi${Caf.toString([1, 2])}there`;"
+