[WIP] [DNM] Backport dart sass parser 5

mgreter · mgreter · commit 69eb4a6ffa43 · 2019-07-13T00:51:11.000+02:00
diff --git a/include/sass/base.h b/include/sass/base.h
@@ -2,7 +2,7 @@
 #define SASS_BASE_H
 
 // #define DEBUG
-// #define DEBUG_SHARED_PTR
+#define DEBUG_SHARED_PTR
 
 #ifdef _MSC_VER
   #pragma warning(disable : 4503)
diff --git a/src/ast_values.cpp b/src/ast_values.cpp
@@ -936,7 +936,7 @@ namespace Sass {
       // debugger << "plain with more than one?\n";
       return "";
     }
-    if (StringLiteral * str = Cast<StringLiteral>(first())) {
+    if (StringLiteral* str = Cast<StringLiteral>(first())) {
       return str->text();
     }
     else {
@@ -1000,7 +1000,7 @@ namespace Sass {
 
   InterpolationObj StringExpression2::getAsInterpolation(bool escape, uint8_t quote)
   {
-    Interpolation* itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");
+    InterpolationObj itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");
 
     if (!hasQuotes()) return text_;
     // debugger << "do asInterpolation magic1\n";
diff --git a/src/context.cpp b/src/context.cpp
@@ -275,8 +275,7 @@ namespace Sass {
     }
 
     std::string text(contents);
-    const char* cstr = text.c_str();
-
+    
     Block_Obj root;
 
     if (Util::ascii_str_ends_with_insensitive(inc.abs_path, ".css")) {
@@ -300,7 +299,7 @@ namespace Sass {
       sass_import_take_srcmap(import);
       // then parse the root block
       root = SASS_MEMORY_NEW(Block, "[blk]", p2.parse(), true);
-
+      // debug_ast(root);
     }
 
     // delete memory of current stack frame
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -317,8 +317,9 @@ inline std::string pstate_source_position(AST_Node* node)
     << "-[" << end.line << ":" << end.column << "]";
 #ifdef DEBUG_SHARED_PTR
       str << "x" << node->getRefCount() << ""
-      << " " << node->getDbgFile()
-      << "@" << node->getDbgLine();
+        << " {#" << node->objId << "}"
+        << " " << node->getDbgFile()
+        << "@" << node->getDbgLine();
 #endif
   return str.str();
 }
@@ -933,9 +934,9 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
   } else if (Cast<StringExpression2>(node)) {
     StringExpression2* expression = Cast<StringExpression2>(node);
     // std::cerr << ind << "StringExpression " << expression;
-    // std::cerr << " (" << pstate_source_position(node) << ")";
     // std::cerr << " [" << prettyprint(expression->text()) << "]";
     std::cerr << ind << "StringExpression";
+    std::cerr << " (" << pstate_source_position(node) << ")";
     if (expression->hasQuotes()) std::cerr << " {quoted}";
     std::cerr << std::endl;
     debug_ast(expression->text(), ind + "  ");
@@ -968,9 +969,9 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
   } else if (Cast<Interpolation>(node)) {
     Interpolation* expression = Cast<Interpolation>(node);
     std::cerr << ind << "Interpolation";
+    std::cerr << " (" << pstate_source_position(expression) << ")";
 
     // std::cerr << ind << "Interpolation " << expression;
-    // std::cerr << " (" << pstate_source_position(expression) << ")";
     // std::cerr << " " << expression->concrete_type();
     // std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << std::endl;
diff --git a/src/devlog.cpp b/src/devlog.cpp
@@ -5,7 +5,7 @@ namespace Sass {
   std::ostringstream stdnull;
 
   void STDERR::writeln(const std::string& msg) {
-    debugger << msg << "\n";
+    // debugger << msg << "\n";
   }
 
 }
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -1384,7 +1384,7 @@ namespace Sass {
 
       Expression* expression = value;
       // debug_ast(expression, "perform now: ");
-      Expression* result = expression->perform(this);
+      ExpressionObj result = expression->perform(this);
 
       if (String_Quoted * result = Cast<String_Quoted>(value)) {
         // std::cerr << "have a quoted string\n";
@@ -1470,7 +1470,7 @@ namespace Sass {
       // }
       else {
         // std::cerr << "perform item\n";
-        Expression* result = item->perform(this);
+        ExpressionObj result = item->perform(this);
         // std::cerr << "performed item\n";
         if (StringLiteral * lit = Cast<StringLiteral>(result)) {
           // std::cerr << "APPEND STRING [" << lit->text() << "]\n";
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -528,7 +528,7 @@ namespace Sass {
     auto back = block_stack.back();
     // block_stack.pop_back();
     for ( size_t i = 0, S = imp->incs().size(); i < S; ++i) {
-      auto asd = SASS_MEMORY_NEW(Import_Stub, "[pstate]", imp->incs()[i]);
+      Import_StubObj asd = SASS_MEMORY_NEW(Import_Stub, "[pstate]", imp->incs()[i]);
 
       asd->perform(this);
     }
@@ -631,7 +631,7 @@ namespace Sass {
       if (!c->is_important()) return NULL;
     }
     eval.is_in_comment = true;
-    Comment* rv = nullptr;
+    CommentObj rv;
     if (Interpolation * itpl = Cast<Interpolation>(c->text())) {
       std::string text = performInterpolation(itpl);
       rv = SASS_MEMORY_NEW(Comment, c->pstate(), SASS_MEMORY_NEW(StringLiteral, "[pstate]", text), c->is_important());
@@ -642,7 +642,7 @@ namespace Sass {
     }
     eval.is_in_comment = false;
     // TODO: eval the text, once we're parsing/storing it as a String_Schema
-    return rv;
+    return rv.detach();
   }
 
   Statement* Expand::operator()(If* i)
@@ -872,7 +872,7 @@ namespace Sass {
 
       Expression* expression = value;
 
-      Expression* result = expression->perform(&eval);
+      ExpressionObj result = expression->perform(&eval);
 
       if (Cast<Null>(result)) continue;
       if (result == nullptr) continue;
diff --git a/src/fn_lists.cpp b/src/fn_lists.cpp
@@ -203,7 +203,7 @@ namespace Sass {
       if (m) {
         l = m->to_list(pstate);
       }
-      List* result = SASS_MEMORY_COPY(l);
+      ListObj result = SASS_MEMORY_COPY(l);
       std::string sep_str(unquote(sep->value()));
       if (sep_str != "auto") { // check default first
         if (sep_str == "space") result->separator(SASS_SPACE);
@@ -221,7 +221,7 @@ namespace Sass {
       } else {
         result->append(v);
       }
-      return result;
+      return result.detach();
     }
 
     Signature zip_sig = "zip($lists...)";
diff --git a/src/fn_utils.cpp b/src/fn_utils.cpp
@@ -13,7 +13,7 @@ namespace Sass {
   {
     ScssParser p2(ctx, sig, 0, 0);
     std::string name(Util::normalize_underscores(p2.identifier()));
-    Parameters_Obj params = p2.parseArgumentDeclaration();
+    ParametersObj params = p2.parseArgumentDeclaration();
     return SASS_MEMORY_NEW(Definition,
                           ParserState("[built-in function]"),
                           sig, name, params, func, false);
diff --git a/src/interpolation.cpp b/src/interpolation.cpp
@@ -25,7 +25,7 @@ namespace Sass {
 
   Interpolation* InterpolationBuffer::getInterpolation()
   {
-    auto itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");
+    Interpolation* itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");
     for (PreValueObj item : contents) {
       // Appends an Expression
       itpl->append(item);
@@ -39,7 +39,7 @@ namespace Sass {
 
   Interpolation* InterpolationBuffer::getInterpolation(ParserState pstate)
   {
-    auto itpl = SASS_MEMORY_NEW(Interpolation, pstate);
+    InterpolationObj itpl = SASS_MEMORY_NEW(Interpolation, pstate);
     for (PreValueObj item : contents) {
       // Appends an Expression
       itpl->append(item);
@@ -48,7 +48,9 @@ namespace Sass {
       // Appends a StringLiteral from the remaining text in the string buffer
       itpl->append(SASS_MEMORY_NEW(StringLiteral, pstate, text.toString()));
     }
-    return itpl;
+    size_t objId = itpl->objId;
+    // debugger << itpl->objId << "\n";
+    return itpl.detach();
   }
 
   // Flushes [text] to [contents] if necessary.
@@ -105,11 +107,11 @@ namespace Sass {
 
   }
 
-  void InterpolationBuffer::addInterpolation(const Interpolation* schema)
+  void InterpolationBuffer::addInterpolation(const InterpolationObj schema)
   {
     if (schema->empty()) return;
     // debug_ast(schema);
-    debugger << "addInterpolation [" << schema->to_string() << "]\n";
+    // debugger << "addInterpolation [" << schema->to_string() << "]\n";
 
     auto& elements = schema->elements();
     auto addStart = elements.begin();
diff --git a/src/interpolation.hpp b/src/interpolation.hpp
@@ -104,7 +104,7 @@ namespace Sass {
     void writeCharCode(uint32_t character);
 
     void addInterpolation(const String_Schema* schema);
-    void addInterpolation(const Interpolation* schema);
+    void addInterpolation(const InterpolationObj schema);
 
     void write(char character)
     {
diff --git a/src/memory/SharedPtr.cpp b/src/memory/SharedPtr.cpp
@@ -26,8 +26,10 @@ namespace Sass {
       }
     }
   }
+  size_t SharedObj::objCount = 0;
   std::vector<SharedObj*> SharedObj::all;
-  #endif
+  std::unordered_set<size_t> SharedObj::deleted;
+#endif
 
   bool SharedObj::taint = false;
 }
diff --git a/src/memory/SharedPtr.hpp b/src/memory/SharedPtr.hpp
@@ -9,6 +9,10 @@
 #include <type_traits>
 #include <vector>
 
+#ifdef DEBUG_SHARED_PTR
+#include <unordered_set>
+#endif
+
 // https://lokiastari.com/blog/2014/12/30/c-plus-plus-by-example-smart-pointer/index.html
 // https://lokiastari.com/blog/2015/01/15/c-plus-plus-by-example-smart-pointer-part-ii/index.html
 // https://lokiastari.com/blog/2015/01/23/c-plus-plus-by-example-smart-pointer-part-iii/index.html
@@ -60,6 +64,7 @@ namespace Sass {
    public:
     SharedObj() : refcount(0), detached(false) {
       #ifdef DEBUG_SHARED_PTR
+      this->objId = ++objCount;
       if (taint) all.push_back(this);
       #endif
     }
@@ -71,6 +76,7 @@ namespace Sass {
           break;
         }
       }
+      erased = true;
       #endif
     }
 
@@ -99,9 +105,15 @@ namespace Sass {
     #ifdef DEBUG_SHARED_PTR
     std::string file;
     size_t line;
+  public:
+    size_t objId;
+  protected:
     bool dbg = false;
+    bool erased = false;
+    static size_t objCount;
     static std::vector<SharedObj*> all;
-    #endif
+    static std::unordered_set<size_t> deleted;
+#endif
   };
 
   // SharedPtr is a intermediate (template-less) base class for SharedImpl.
@@ -137,15 +149,29 @@ namespace Sass {
     SharedObj* detach() {
       if (node != nullptr) node->detached = true;
       #ifdef DEBUG_SHARED_PTR
-      if (node->dbg) {
+      if (node && node->dbg) {
         std::cerr << "DETACHING NODE\n";
       }
       #endif 
       return node;
     }
 
-    SharedObj* obj() const { return node; }
-    SharedObj* operator->() const { return node; }
+    SharedObj* obj() const {
+      #ifdef DEBUG_SHARED_PTR
+      if (node && node->deleted.count(node->objId) == 1) {
+        std::cerr << "ACCESSING DELETED " << node << "\n";
+      }
+      #endif
+      return node;
+    }
+    SharedObj* operator->() const {
+      #ifdef DEBUG_SHARED_PTR
+      if (node && node->deleted.count(node->objId) == 1) {
+        std::cerr << "ACCESSING DELETED " << node << "\n";
+      }
+      #endif
+      return node;
+    }
     bool isNull() const { return node == nullptr; }
     operator bool() const { return node != nullptr; }
 
@@ -159,9 +185,10 @@ namespace Sass {
       #endif
       if (node->refcount == 0 && !node->detached) {
         #ifdef DEBUG_SHARED_PTR
-        if (node->dbg) std::cerr << "DELETE NODE " << node << "\n";
+          if (node->dbg) std::cerr << "DELETE NODE " << node << "\n";
+          node->deleted.insert(node->objId);
         #endif
-        // delete node;
+        delete node;
       }
       else if (node->refcount == 0) {
         #ifdef DEBUG_SHARED_PTR
diff --git a/src/parser.hpp b/src/parser.hpp
@@ -153,6 +153,7 @@ namespace Sass {
     std::string rawText(T(X::* consumer)())
     {
       const char* start = scanner.position;
+      // We need to clean up after ourself
       (static_cast<X*>(this)->*consumer)();
       return scanner.substring(start);
     }
diff --git a/src/parser_expression.cpp b/src/parser_expression.cpp
@@ -49,7 +49,7 @@ namespace Sass {
     operators(),
     operands(),
     allowSlash(false),
-    singleExpression(nullptr),
+    singleExpression(),
     parser(parser)
   {
     debugger << ("LOOK AT NUMBER\n");
@@ -108,7 +108,7 @@ namespace Sass {
     }
   }
 
-  void ExpressionParser::addSingleExpression(Expression* expression, bool number)
+  void ExpressionParser::addSingleExpression(ExpressionObj expression, bool number)
   {
     debugger << "IN addSingleExpression\n";
     if (singleExpression != nullptr) {
diff --git a/src/parser_expression.hpp b/src/parser_expression.hpp
@@ -33,7 +33,7 @@ namespace Sass {
     bool allowSlash = false;
 
     /// The leftmost expression that's been fully-parsed. Never `null`.
-    Expression* singleExpression;
+    ExpressionObj singleExpression;
 
     StylesheetParser& parser;
 
@@ -47,7 +47,7 @@ namespace Sass {
 
     void resolveOperations();
 
-    void addSingleExpression(Expression* expression, bool number = false);
+    void addSingleExpression(ExpressionObj expression, bool number = false);
 
     void addOperator(Sass_OP op);
 
diff --git a/src/parser_scss.cpp b/src/parser_scss.cpp
diff --git a/src/parser_selector.cpp b/src/parser_selector.cpp
diff --git a/src/parser_stylesheet.cpp b/src/parser_stylesheet.cpp
diff --git a/src/parser_stylesheet.hpp b/src/parser_stylesheet.hpp

Original file line number	Diff line number	Diff line change
`@@ -936,7 +936,7 @@ namespace Sass {`
`936`	`936`	`// debugger << "plain with more than one?\n";`
`937`	`937`	`return "";`
`938`	`938`	`}`
`939`		`- if (StringLiteral * str = Cast<StringLiteral>(first())) {`
	`939`	`+ if (StringLiteral* str = Cast<StringLiteral>(first())) {`
`940`	`940`	`return str->text();`
`941`	`941`	`}`
`942`	`942`	`else {`
`@@ -1000,7 +1000,7 @@ namespace Sass {`
`1000`	`1000`
`1001`	`1001`	`InterpolationObj StringExpression2::getAsInterpolation(bool escape, uint8_t quote)`
`1002`	`1002`	`{`
`1003`		`- Interpolation* itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");`
	`1003`	`+ InterpolationObj itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");`
`1004`	`1004`
`1005`	`1005`	`if (!hasQuotes()) return text_;`
`1006`	`1006`	`// debugger << "do asInterpolation magic1\n";`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Sass {`
`5`	`5`	`std::ostringstream stdnull;`
`6`	`6`
`7`	`7`	`void STDERR::writeln(const std::string& msg) {`
`8`		`- debugger << msg << "\n";`
	`8`	`+ // debugger << msg << "\n";`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ namespace Sass {`
`203`	`203`	`if (m) {`
`204`	`204`	`l = m->to_list(pstate);`
`205`	`205`	`}`
`206`		`- List* result = SASS_MEMORY_COPY(l);`
	`206`	`+ ListObj result = SASS_MEMORY_COPY(l);`
`207`	`207`	`std::string sep_str(unquote(sep->value()));`
`208`	`208`	`if (sep_str != "auto") { // check default first`
`209`	`209`	`if (sep_str == "space") result->separator(SASS_SPACE);`
`@@ -221,7 +221,7 @@ namespace Sass {`
`221`	`221`	`} else {`
`222`	`222`	`result->append(v);`
`223`	`223`	`}`
`224`		`- return result;`
	`224`	`+ return result.detach();`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`Signature zip_sig = "zip($lists...)";`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Sass {`
`13`	`13`	`{`
`14`	`14`	`ScssParser p2(ctx, sig, 0, 0);`
`15`	`15`	`std::string name(Util::normalize_underscores(p2.identifier()));`
`16`		`- Parameters_Obj params = p2.parseArgumentDeclaration();`
	`16`	`+ ParametersObj params = p2.parseArgumentDeclaration();`
`17`	`17`	`return SASS_MEMORY_NEW(Definition,`
`18`	`18`	`ParserState("[built-in function]"),`
`19`	`19`	`sig, name, params, func, false);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace Sass {`
`25`	`25`
`26`	`26`	`Interpolation* InterpolationBuffer::getInterpolation()`
`27`	`27`	`{`
`28`		`- auto itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");`
	`28`	`+ Interpolation* itpl = SASS_MEMORY_NEW(Interpolation, "[pstate]");`
`29`	`29`	`for (PreValueObj item : contents) {`
`30`	`30`	`// Appends an Expression`
`31`	`31`	`itpl->append(item);`
`@@ -39,7 +39,7 @@ namespace Sass {`
`39`	`39`
`40`	`40`	`Interpolation* InterpolationBuffer::getInterpolation(ParserState pstate)`
`41`	`41`	`{`
`42`		`- auto itpl = SASS_MEMORY_NEW(Interpolation, pstate);`
	`42`	`+ InterpolationObj itpl = SASS_MEMORY_NEW(Interpolation, pstate);`
`43`	`43`	`for (PreValueObj item : contents) {`
`44`	`44`	`// Appends an Expression`
`45`	`45`	`itpl->append(item);`
`@@ -48,7 +48,9 @@ namespace Sass {`
`48`	`48`	`// Appends a StringLiteral from the remaining text in the string buffer`
`49`	`49`	`itpl->append(SASS_MEMORY_NEW(StringLiteral, pstate, text.toString()));`
`50`	`50`	`}`
`51`		`- return itpl;`
	`51`	`+ size_t objId = itpl->objId;`
	`52`	`+ // debugger << itpl->objId << "\n";`
	`53`	`+ return itpl.detach();`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`// Flushes [text] to [contents] if necessary.`
`@@ -105,11 +107,11 @@ namespace Sass {`
`105`	`107`
`106`	`108`	`}`
`107`	`109`
`108`		`- void InterpolationBuffer::addInterpolation(const Interpolation* schema)`
	`110`	`+ void InterpolationBuffer::addInterpolation(const InterpolationObj schema)`
`109`	`111`	`{`
`110`	`112`	`if (schema->empty()) return;`
`111`	`113`	`// debug_ast(schema);`
`112`		`- debugger << "addInterpolation [" << schema->to_string() << "]\n";`
	`114`	`+ // debugger << "addInterpolation [" << schema->to_string() << "]\n";`
`113`	`115`
`114`	`116`	`auto& elements = schema->elements();`
`115`	`117`	`auto addStart = elements.begin();`