Fix comment parsing

Author: mgreter

src/parser.cpp

@@ -63,7 +63,7 @@ namespace Sass {
       return true;
     }
     else if (next == $asterisk) {
-      loudComment();
+      scanLoudComment();
       return true;
     }
     else {
@@ -82,14 +82,11 @@ namespace Sass {
   }
 
   // Consumes and ignores a loud (CSS-style) comment.
-  void Parser::loudComment()
+  void Parser::scanLoudComment()
   {
     scanner.expect("/*");
     while (true) {
       auto next = scanner.readChar();
-      if (isNewline(next)) {
-        scanner._fail("*/");
-      }
       if (next != $asterisk) continue;
 
       do {
@@ -275,7 +272,7 @@ namespace Sass {
 
       case $slash:
         if (scanner.peekChar(1) == $asterisk) {
-          buffer.write(rawText(&Parser::loudComment));
+          buffer.write(rawText(&Parser::scanLoudComment));
         }
         else {
           buffer.write(scanner.readChar());

src/parser.hpp

@@ -91,7 +91,7 @@ namespace Sass {
     virtual SilentComment* readSilentComment();
 
     // Consumes and ignores a loud (CSS-style) comment.
-    void loudComment();
+    virtual void scanLoudComment();
 
     // Consumes a plain CSS identifier. If [unit] is `true`, this 
     // doesn't parse a `-` followed by a digit. This ensures that 

src/parser_sass.cpp

@@ -24,6 +24,26 @@ namespace Sass {
     return buffer.getInterpolation(scanner.rawSpanFrom(start));
   }
 
+  // Consumes and ignores a loud (CSS-style) comment.
+  // This overrides loud comment consumption so that
+  // it doesn't consume multi-line comments.
+  void SassParser::scanLoudComment()
+  {
+    scanner.expect("/*");
+    while (true) {
+      auto next = scanner.readChar();
+      if (isNewline(next)) {
+        scanner._fail("*/");
+      }
+      if (next != $asterisk) continue;
+
+      do {
+        next = scanner.readChar();
+      } while (next == $asterisk);
+      if (next == $slash) break;
+    }
+  }
+
   void SassParser::expectStatementSeparator(sass::string name) {
     if (!atEndOfStatement()) expectNewline();
     if (peekIndentation() <= currentIndentation) return;
@@ -182,7 +202,7 @@ namespace Sass {
         return lastSilentComment.ptr();
         break;
       case $asterisk:
-        return loudComment();
+        return readLoudComment();
         break;
       default:
         return (this->*child)();
@@ -243,7 +263,7 @@ namespace Sass {
     return lastSilentComment;
   }
 
-  LoudComment* SassParser::loudComment()
+  LoudComment* SassParser::readLoudComment()
   {
     Offset start(scanner.offset);
     scanner.expect("/*");

src/parser_sass.hpp

@@ -114,7 +114,9 @@ namespace Sass {
     // Consumes an indented-style loud context.
     // This overrides loud comment consumption so
     // that it doesn't consume multi-line comments.
-    LoudComment* loudComment();
+    LoudComment* readLoudComment();
+
+    void scanLoudComment() override final;
 
     void scanWhitespaceWithoutComments() override final;
 

src/parser_scss.cpp

@@ -109,7 +109,7 @@ namespace Sass {
           scanWhitespaceWithoutComments();
           break;
         case $asterisk:
-          children.emplace_back(loudComment());
+          children.emplace_back(readLoudComment());
           scanWhitespaceWithoutComments();
           break;
         default:
@@ -155,7 +155,7 @@ namespace Sass {
           scanWhitespaceWithoutComments();
           break;
         case $asterisk:
-          statements.emplace_back(loudComment());
+          statements.emplace_back(readLoudComment());
           scanWhitespaceWithoutComments();
           break;
         default:
@@ -205,7 +205,7 @@ namespace Sass {
   // EO readSilentComment
 
   // Consumes a statement-level loud comment block.
-  LoudComment* ScssParser::loudComment()
+  LoudComment* ScssParser::readLoudComment()
   {
     InterpolationBuffer buffer(scanner);
     Offset start(scanner.offset);

src/parser_scss.hpp

@@ -81,7 +81,7 @@ namespace Sass {
     virtual SilentComment* readSilentComment() override;
 
     // Consumes a statement-level loud comment block.
-    virtual LoudComment* loudComment();
+    virtual LoudComment* readLoudComment();
 
     /////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////

src/parser_stylesheet.cpp

@@ -540,7 +540,7 @@ namespace Sass {
     }
 
     isUseAllowed = false;
-    if (scanner.matches("/*")) nameBuffer.write(rawText(&StylesheetParser::loudComment));
+    if (scanner.matches("/*")) nameBuffer.write(rawText(&StylesheetParser::scanLoudComment));
 
     StringBuffer midBuffer;
     midBuffer.write(rawText(&StylesheetParser::scanWhitespace));
@@ -4713,7 +4713,7 @@ namespace Sass {
 
       case $slash:
         if (scanner.peekChar(1) == $asterisk) {
-          buffer.write(rawText(&StylesheetParser::loudComment));
+          buffer.write(rawText(&StylesheetParser::scanLoudComment));
         }
         else {
           buffer.write(scanner.readChar());