Merge pull request #1330 from mgreter/refactoring/parser-for-3.3-B

xzyfer · xzyfer · commit e974dddc4771 · 2015-07-14T22:34:52.000+10:00
Additional fixes for 3.3 release
diff --git a/ast.cpp b/ast.cpp
@@ -911,21 +911,38 @@ namespace Sass {
     }
   }
 
-  /* not used anymore - remove?
-  vector<Compound_Selector*> Complex_Selector::to_vector()
+  void Arguments::adjust_after_pushing(Argument* a)
   {
-    vector<Compound_Selector*> result;
-    Compound_Selector* h = head();
-    Complex_Selector* t = tail();
-    if (h) result.push_back(h);
-    while (t)
-    {
-      h = t->head();
-      t = t->tail();
-      if (h) result.push_back(h);
+    if (!a->name().empty()) {
+      if (/* has_rest_argument_ || */ has_keyword_argument_) {
+        error("named arguments must precede variable-length argument", a->pstate());
+      }
+      has_named_arguments_ = true;
     }
-    return result;
-  }*/
+    else if (a->is_rest_argument()) {
+      if (has_rest_argument_) {
+        error("functions and mixins may only be called with one variable-length argument", a->pstate());
+      }
+      if (has_keyword_argument_) {
+        error("only keyword arguments may follow variable arguments", a->pstate());
+      }
+      has_rest_argument_ = true;
+    }
+    else if (a->is_keyword_argument()) {
+      if (has_keyword_argument_) {
+        error("functions and mixins may only be called with one keyword argument", a->pstate());
+      }
+      has_keyword_argument_ = true;
+    }
+    else {
+      if (has_rest_argument_) {
+        error("ordinal arguments must precede variable-length arguments", a->pstate());
+      }
+      if (has_named_arguments_) {
+        error("ordinal arguments must precede named arguments", a->pstate());
+      }
+    }
+  }
 
   Number::Number(ParserState pstate, double val, string u, bool zero)
   : Expression(pstate),
diff --git a/ast.hpp b/ast.hpp
@@ -1015,38 +1015,7 @@ namespace Sass {
     ADD_PROPERTY(bool, has_rest_argument)
     ADD_PROPERTY(bool, has_keyword_argument)
   protected:
-    void adjust_after_pushing(Argument* a)
-    {
-      if (!a->name().empty()) {
-        if (has_rest_argument_ || has_keyword_argument_) {
-          error("named arguments must precede variable-length argument", a->pstate());
-        }
-        has_named_arguments_ = true;
-      }
-      else if (a->is_rest_argument()) {
-        if (has_rest_argument_) {
-          error("functions and mixins may only be called with one variable-length argument", a->pstate());
-        }
-        if (has_keyword_argument_) {
-          error("only keyword arguments may follow variable arguments", a->pstate());
-        }
-        has_rest_argument_ = true;
-      }
-      else if (a->is_keyword_argument()) {
-        if (has_keyword_argument_) {
-          error("functions and mixins may only be called with one keyword argument", a->pstate());
-        }
-        has_keyword_argument_ = true;
-      }
-      else {
-        if (has_rest_argument_) {
-          error("ordinal arguments must precede variable-length arguments", a->pstate());
-        }
-        if (has_named_arguments_) {
-          error("ordinal arguments must precede named arguments", a->pstate());
-        }
-      }
-    }
+    void adjust_after_pushing(Argument* a);
   public:
     Arguments(ParserState pstate)
     : Expression(pstate),
@@ -2010,11 +1979,12 @@ namespace Sass {
   ////////////////////////////////////////////////////////////////////////////
   class Complex_Selector : public Selector {
   public:
-    enum Combinator { ANCESTOR_OF, PARENT_OF, PRECEDES, ADJACENT_TO };
+    enum Combinator { ANCESTOR_OF, PARENT_OF, PRECEDES, ADJACENT_TO, REFERENCE };
   private:
     ADD_PROPERTY(Combinator, combinator)
     ADD_PROPERTY(Compound_Selector*, head)
     ADD_PROPERTY(Complex_Selector*, tail)
+    ADD_PROPERTY(String*, reference);
   public:
     bool contains_placeholder() {
       if (head() && head()->contains_placeholder()) return true;
@@ -2025,7 +1995,7 @@ namespace Sass {
                      Combinator c = ANCESTOR_OF,
                      Compound_Selector* h = 0,
                      Complex_Selector* t = 0)
-    : Selector(pstate), combinator_(c), head_(h), tail_(t)
+    : Selector(pstate), combinator_(c), head_(h), tail_(t), reference_(0)
     {
       if ((h && h->has_reference())   || (t && t->has_reference()))   has_reference(true);
       if ((h && h->has_placeholder()) || (t && t->has_placeholder())) has_placeholder(true);
diff --git a/bind.cpp b/bind.cpp
@@ -121,7 +121,11 @@ namespace Sass {
           while (ia < LA) {
             // get and post inc
             a = (*as)[ia++];
-            // wrap current argument into new object
+            // maybe we have another list as argument
+            List* ls = dynamic_cast<List*>(a->value());
+            // skip any list completely if empty
+            if (ls && ls->empty()) continue;
+            // check if we have rest argument
             (*arglist) << new (ctx.mem) Argument(a->pstate(),
                                                  a->value(),
                                                  a->name(),
diff --git a/configure.ac b/configure.ac
@@ -13,10 +13,13 @@ AC_CONFIG_AUX_DIR([script])
 # Though they look like gcc flags!
 AM_INIT_AUTOMAKE([foreign parallel-tests -Wall])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+# would fail with mingw otherwise
+m4_pattern_allow([AM_PROG_AR])
 
 # Checks for programs.
 AC_PROG_CXX
 AC_LANG([C++])
+AM_PROG_AR([])
 LT_INIT([dlopen])
 
 # Checks for header files.
diff --git a/context.cpp b/context.cpp
@@ -58,7 +58,8 @@ namespace Sass {
     c_options               (initializers.c_options()),
     c_compiler              (initializers.c_compiler()),
     source_c_str            (initializers.source_c_str()),
-    sources                 (vector<const char*>()),
+    sources                 (vector<char*>()),
+    strings                 (vector<char*>()),
     plugin_paths            (initializers.plugin_paths()),
     include_paths           (initializers.include_paths()),
     queue                   (vector<Sass_Queued>()),
@@ -148,12 +149,16 @@ namespace Sass {
 
   Context::~Context()
   {
-    // everything that gets put into sources will be freed by us
-    for (size_t n = 0; n < import_stack.size(); ++n) sass_delete_import(import_stack[n]);
+    // make sure we free the source even if not processed!
+    if (sources.size() == 0 && source_c_str) free(source_c_str);
     // sources are allocated by strdup or malloc (overtaken from C code)
-    for (size_t i = 0; i < sources.size(); ++i) free((void*)sources[i]);
-    // clear inner structures (vectors)
-    sources.clear(); import_stack.clear();
+    for (size_t i = 0; i < sources.size(); ++i) free(sources[i]);
+    // free all strings we kept alive during compiler execution
+    for (size_t n = 0; n < strings.size(); ++n) free(strings[n]);
+    // everything that gets put into sources will be freed by us
+    for (size_t m = 0; m < import_stack.size(); ++m) sass_delete_import(import_stack[m]);
+    // clear inner structures (vectors) and input source
+    sources.clear(); import_stack.clear(); source_c_str = 0;
   }
 
   void Context::setup_color_map()
@@ -245,7 +250,7 @@ namespace Sass {
       }
     }
   }
-  void Context::add_source(string load_path, string abs_path, const char* contents)
+  void Context::add_source(string load_path, string abs_path, char* contents)
   {
     sources.push_back(contents);
     included_files.push_back(abs_path);
@@ -317,8 +322,10 @@ namespace Sass {
         0, 0
       );
       import_stack.push_back(import);
-      const char* path = sass_strdup(queue[i].abs_path.c_str());
-      Parser p(Parser::from_c_str(queue[i].source, *this, ParserState(path, queue[i].source, i)));
+      // keep a copy of the path around (for parser states)
+      strings.push_back(sass_strdup(queue[i].abs_path.c_str()));
+      ParserState pstate(strings.back(), queue[i].source, i);
+      Parser p(Parser::from_c_str(queue[i].source, *this, pstate));
       Block* ast = p.parse();
       sass_delete_import(import_stack.back());
       import_stack.pop_back();
@@ -369,7 +376,7 @@ namespace Sass {
     if(is_indented_syntax_src) {
       char * contents = sass2scss(source_c_str, SASS2SCSS_PRETTIFY_1 | SASS2SCSS_KEEP_COMMENT);
       add_source(input_path, input_path, contents);
-      delete [] source_c_str;
+      free(source_c_str);
       return parse_file();
     }
     add_source(input_path, input_path, source_c_str);
diff --git a/context.hpp b/context.hpp
@@ -37,11 +37,13 @@ namespace Sass {
 
     struct Sass_Options* c_options;
     struct Sass_Compiler* c_compiler;
-    const char* source_c_str;
+    char* source_c_str;
 
     // c-strs containing Sass file contents
     // we will overtake ownership of memory
-    vector<const char*> sources;
+    vector<char*> sources;
+    // strings get freed with context
+    vector<char*> strings;
     // absolute paths to includes
     vector<string> included_files;
     // relative links to includes
@@ -87,7 +89,7 @@ namespace Sass {
     KWD_ARG_SET(Data) {
       KWD_ARG(Data, struct Sass_Options*, c_options)
       KWD_ARG(Data, struct Sass_Compiler*, c_compiler)
-      KWD_ARG(Data, const char*,     source_c_str)
+      KWD_ARG(Data, char*,           source_c_str)
       KWD_ARG(Data, string,          entry_point)
       KWD_ARG(Data, string,          input_path)
       KWD_ARG(Data, string,          output_path)
@@ -117,7 +119,7 @@ namespace Sass {
 
     Block* parse_file();
     Block* parse_string();
-    void add_source(string, string, const char*);
+    void add_source(string, string, char*);
 
     string add_file(const string& file);
     string add_file(const string& base, const string& file);
diff --git a/debugger.hpp b/debugger.hpp
@@ -123,7 +123,9 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
         case Complex_Selector::PRECEDES:    del = "~"; break;
         case Complex_Selector::ADJACENT_TO: del = "+"; break;
         case Complex_Selector::ANCESTOR_OF: del = " "; break;
+        case Complex_Selector::REFERENCE:   del = "//"; break;
       }
+      // if (del = "/") del += selector->reference()->perform(&to_string) + "/";
     cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
     debug_ast(selector->head(), ind + " " /* + "[" + del + "]" */, env);
     if (selector->tail()) {
diff --git a/eval.cpp b/eval.cpp
@@ -890,6 +890,11 @@ namespace Sass {
     } else if (dynamic_cast<Unary_Expression*>(s)) {
       Expression* ex = s->perform(this);
       return evacuate_quotes(interpolation(ex));
+    } else if (dynamic_cast<Map*>(s)) {
+      To_String to_string(&ctx);
+      string dbg(s->perform(&to_string));
+      error(dbg + " isn't a valid CSS value.", s->pstate());
+      return dbg;
     } else {
       To_String to_string(&ctx);
       return evacuate_quotes(s->perform(&to_string));
@@ -1397,8 +1402,11 @@ namespace Sass {
     bool parentized = false;
     Complex_Selector* tail = s->tail();
     Compound_Selector* head = s->head();
+    String* reference = s->reference();
     Complex_Selector::Combinator combinator = s->combinator();
     Selector_List* sl = new (ctx.mem) Selector_List(s->pstate());
+    if (reference) reference = (String*) reference->perform(this);
+
     if (head) {
       // check if we have a parent selector reference (expands to list)
       if (head->length() > 1 && dynamic_cast<Parent_Selector*>((*head)[0])) {
@@ -1413,6 +1421,7 @@ namespace Sass {
             for (size_t i = 1, L = head->length(); i < L; ++i) *lst_h << (*head)[i];
             lst_t->tail(tail); // now connect old tail back to new intermediate
             lst_t->combinator(combinator); // and dont forget the combinator
+            lst_t->reference(reference);
             // if (s->has_line_feed()) lst_t->has_line_feed(true); // and dont forget the combinator
           }
           return ns;
@@ -1445,6 +1454,7 @@ namespace Sass {
                 lst->tail(ins);
               } else {
                 lst->combinator(combinator);
+                lst->reference(reference);
               }
             }
             if (s->has_line_feed()) (*ns)[n]->has_line_feed(true);
diff --git a/extend.cpp b/extend.cpp
@@ -76,6 +76,7 @@ namespace Sass {
       case Complex_Selector::PARENT_OF:   os << "\">\""; break;
       case Complex_Selector::PRECEDES:    os << "\"~\""; break;
       case Complex_Selector::ADJACENT_TO: os << "\"+\""; break;
+      case Complex_Selector::REFERENCE: os    << "\"/\""; break;
     }
 
     return os;
diff --git a/functions.cpp b/functions.cpp
@@ -210,7 +210,7 @@ namespace Sass {
 
     inline double color_num(Number* n) {
       if (n->unit() == "%") {
-        return std::min(std::max(n->value(), 0.0), 1.0) * 255;
+        return std::min(std::max(n->value(), 0.0), 100.0) * 2.55;
       } else {
         return std::min(std::max(n->value(), 0.0), 255.0);
       }
diff --git a/inspect.cpp b/inspect.cpp
@@ -925,6 +925,13 @@ namespace Sass {
         append_string("+");
         append_optional_space();
       break;
+      case Complex_Selector::REFERENCE:
+        append_mandatory_space();
+        append_string("/");
+        c->reference()->perform(this);
+        append_string("/");
+        append_mandatory_space();
+      break;
       case Complex_Selector::PRECEDES:
         if (is_empty) append_optional_space();
         else append_mandatory_space();
diff --git a/listize.cpp b/listize.cpp
@@ -45,6 +45,9 @@ namespace Sass {
       if (hh) *l << hh;
     }
 
+    To_String to_string;
+    string reference = ! sel->reference() ? ""
+      : sel->reference()->perform(&to_string);
     switch(sel->combinator())
     {
       case Complex_Selector::PARENT_OF:
@@ -53,6 +56,9 @@ namespace Sass {
       case Complex_Selector::ADJACENT_TO:
         *l << new (ctx.mem) String_Quoted(sel->pstate(), "+");
       break;
+      case Complex_Selector::REFERENCE:
+        *l << new (ctx.mem) String_Quoted(sel->pstate(), "/" + reference + "/");
+      break;
       case Complex_Selector::PRECEDES:
         *l << new (ctx.mem) String_Quoted(sel->pstate(), "~");
       break;
diff --git a/node.cpp b/node.cpp
@@ -142,6 +142,7 @@ namespace Sass {
         case Complex_Selector::PARENT_OF:   os << "\">\""; break;
         case Complex_Selector::PRECEDES:    os << "\"~\""; break;
         case Complex_Selector::ADJACENT_TO: os << "\"+\""; break;
+        case Complex_Selector::REFERENCE: os    << "\"/\""; break;
       }
 
     } else if (node.isNil()) {
diff --git a/output.cpp b/output.cpp
@@ -23,6 +23,13 @@ namespace Sass {
     top_nodes.push_back(imp);
   }
 
+  void Output::operator()(Map* m)
+  {
+    To_String to_string(ctx);
+    string dbg(m->perform(&to_string));
+    error(dbg + " isn't a valid CSS value.", m->pstate());
+  }
+
   OutputBuffer Output::get_buffer(void)
   {
 
diff --git a/output.hpp b/output.hpp
@@ -35,6 +35,7 @@ namespace Sass {
   public:
     OutputBuffer get_buffer(void);
 
+    virtual void operator()(Map*);
     virtual void operator()(Ruleset*);
     // virtual void operator()(Propset*);
     virtual void operator()(Supports_Block*);
diff --git a/parser.cpp b/parser.cpp
diff --git a/prelexer.cpp b/prelexer.cpp
diff --git a/prelexer.hpp b/prelexer.hpp
diff --git a/sass_context.cpp b/sass_context.cpp
diff --git a/sass_interface.h b/sass_interface.h
diff --git a/source_map.cpp b/source_map.cpp
diff --git a/units.hpp b/units.hpp

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ namespace Sass {`
`76`	`76`	`case Complex_Selector::PARENT_OF: os << "\">\""; break;`
`77`	`77`	`case Complex_Selector::PRECEDES: os << "\"~\""; break;`
`78`	`78`	`case Complex_Selector::ADJACENT_TO: os << "\"+\""; break;`
	`79`	`+ case Complex_Selector::REFERENCE: os << "\"/\""; break;`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`return os;`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ namespace Sass {`
`210`	`210`
`211`	`211`	`inline double color_num(Number* n) {`
`212`	`212`	`if (n->unit() == "%") {`
`213`		`- return std::min(std::max(n->value(), 0.0), 1.0) * 255;`
	`213`	`+ return std::min(std::max(n->value(), 0.0), 100.0) * 2.55;`
`214`	`214`	`} else {`
`215`	`215`	`return std::min(std::max(n->value(), 0.0), 255.0);`
`216`	`216`	`}`