Merge branch 'master' of git://github.com/hcatlin/libsass into python

Author: dahlia

color_names.hpp

@@ -1,4 +1,4 @@
-#define SASS_COLOR_NAMES_INCLUDED
+#define SASS_COLOR_NAMES
 
 namespace Sass {
 

context.cpp

@@ -1,6 +1,7 @@
 #include "context.hpp"
 #include <cstring>
 #include <iostream>
+#include <sstream>
 #include <unistd.h>
 #include "prelexer.hpp"
 #include "color_names.hpp"
@@ -60,7 +61,7 @@ namespace Sass {
     collect_include_paths(paths_str);
     setup_color_map();
 
-    string path_string(img_path_str);
+    string path_string(img_path_str ? img_path_str : "");
     path_string = "'" + path_string + "/'";
     image_path = new char[path_string.length() + 1];
     std::strcpy(image_path, path_string.c_str());
@@ -73,21 +74,20 @@ namespace Sass {
     }
     delete[] image_path;
     new_Node.free();
-    // cerr << "Deallocated " << i << " source string(s)." << endl;
   }
 
-  inline void Context::register_function(Function_Descriptor d, Primitive ip)
+  inline void Context::register_function(Signature sig, Primitive ip)
   {
-    Function f(d, ip, new_Node);
-    // function_env[pair<string, size_t>(f.name, f.parameters.size())] = f;
+    Function f(const_cast<char*>(sig), ip, *this);
     function_env[f.name] = f;
   }
 
-  inline void Context::register_function(Function_Descriptor d, Primitive ip, size_t arity)
+  inline void Context::register_function(Signature sig, Primitive ip, size_t arity)
   {
-    Function f(d, ip, new_Node);
-    // function_env[pair<string, size_t>(f.name, arity)] = f;
-    function_env[f.name] = f;
+    Function f(const_cast<char*>(sig), ip, *this);
+    std::stringstream stub;
+    stub << f.name << " " << arity;
+    function_env[stub.str()] = f;
   }
 
   inline void Context::register_overload_stub(string name)
@@ -98,66 +98,63 @@ namespace Sass {
   void Context::register_functions()
   {
     using namespace Functions;
+
     // RGB Functions
-    register_function(rgb_descriptor,  rgb);
+    register_function(rgb_sig,  rgb);
     register_overload_stub("rgba");
-    register_function(rgba_4_descriptor, rgba_4);
-    register_function(rgba_2_descriptor, rgba_2);
-    register_function(red_descriptor, red);
-    register_function(green_descriptor, green);
-    register_function(blue_descriptor, blue);
-    register_overload_stub("mix");
-    register_function(mix_2_descriptor, mix_2);
-    register_function(mix_3_descriptor, mix_3);
+    register_function(rgba_4_sig, rgba_4, 4);
+    register_function(rgba_2_sig, rgba_2, 2);
+    register_function(red_sig, red);
+    register_function(green_sig, green);
+    register_function(blue_sig, blue);
+    register_function(mix_sig, mix);
     // HSL Functions
-    register_function(hsla_descriptor, hsla);
-    register_function(hsl_descriptor, hsl);
-    register_function(invert_descriptor, invert);
+    register_function(hsl_sig, hsl);
+    register_function(hsla_sig, hsla);
+    register_function(hue_sig, hue);
+    register_function(saturation_sig, saturation);
+    register_function(lightness_sig, lightness);
+    register_function(adjust_hue_sig, adjust_hue);
+    register_function(lighten_sig, lighten);
+    register_function(darken_sig, darken);
+    register_function(saturate_sig, saturate);
+    register_function(desaturate_sig, desaturate);
+    register_function(grayscale_sig, grayscale);
+    register_function(complement_sig, complement);
+    register_function(invert_sig, invert);
     // Opacity Functions
-    register_function(alpha_descriptor, alpha);
-    register_function(opacity_descriptor, alpha);
-    register_function(opacify_descriptor, opacify);
-    register_function(fade_in_descriptor, opacify);
-    register_function(transparentize_descriptor, transparentize);
-    register_function(fade_out_descriptor, transparentize);
+    register_function(alpha_sig, alpha);
+    register_function(opacity_sig, opacity);
+    register_function(opacify_sig, opacify);
+    register_function(fade_in_sig, fade_in);
+    register_function(transparentize_sig, transparentize);
+    register_function(fade_out_sig, fade_out);
+    // Other Color Functions
+    register_function(adjust_color_sig, adjust_color);
+    register_function(change_color_sig, change_color);    
     // String Functions
-    register_function(unquote_descriptor, unquote);
-    register_function(quote_descriptor, quote);
+    register_function(unquote_sig, unquote);
+    register_function(quote_sig, quote);
     // Number Functions
-    register_function(percentage_descriptor, percentage);
-    register_function(round_descriptor, round);
-    register_function(ceil_descriptor, ceil);
-    register_function(floor_descriptor, floor);
-    register_function(abs_descriptor, abs);
+    register_function(percentage_sig, percentage);
+    register_function(round_sig, round);
+    register_function(ceil_sig, ceil);
+    register_function(floor_sig, floor);
+    register_function(abs_sig, abs);
     // List Functions
-    register_function(length_descriptor, length);
-    register_function(nth_descriptor, nth);
-    register_overload_stub("join");
-    register_function(join_2_descriptor, join_2);
-    register_function(join_3_descriptor, join_3);
-    register_overload_stub("append");
-    register_function(append_2_descriptor, append_2);
-    register_function(append_3_descriptor, append_3);
-    register_overload_stub("compact");
-    register_function(compact_1_descriptor, compact);
-    register_function(compact_2_descriptor, compact);
-    register_function(compact_3_descriptor, compact);
-    register_function(compact_4_descriptor, compact);
-    register_function(compact_5_descriptor, compact);
-    register_function(compact_6_descriptor, compact);
-    register_function(compact_7_descriptor, compact);
-    register_function(compact_8_descriptor, compact);
-    register_function(compact_9_descriptor, compact);
-    register_function(compact_10_descriptor, compact);
-    register_function(compact_11_descriptor, compact);
-    register_function(compact_12_descriptor, compact);
+    register_function(length_sig, length);
+    register_function(nth_sig, nth);
+    register_function(join_sig, join);
+    register_function(append_sig, append);
+    register_function(compact_sig, compact);
     // Introspection Functions
-    register_function(type_of_descriptor, type_of);
-    register_function(unit_descriptor, unit);
-    register_function(unitless_descriptor, unitless);
-    register_function(comparable_descriptor, comparable);
+    register_function(type_of_sig, type_of);
+    register_function(unit_sig, unit);
+    register_function(unitless_sig, unitless);
+    register_function(comparable_sig, comparable);
     // Boolean Functions
-    register_function(not_descriptor, not_impl);
+    register_function(not_sig, not_impl);
+    register_function(if_sig, if_impl);
   }
 
   void Context::setup_color_map()

context.hpp

@@ -1,45 +1,23 @@
-#define SASS_CONTEXT_INCLUDED
+#define SASS_CONTEXT
 
+//#ifndef SASS_ENVIRONMENT
+#include "environment.hpp"
+//#endif
 
 #include <utility>
-#include <map>
+
+#ifndef SASS_NODE_FACTORY
 #include "node_factory.hpp"
+#endif
+
+#ifndef SASS_FUNCTIONS
 #include "functions.hpp"
+#endif
 
 namespace Sass {
   using std::pair;
   using std::map;
 
-  struct Environment {
-    map<Token, Node> current_frame;
-    Environment* parent;
-    Environment* global;
-    
-    Environment()
-    : current_frame(map<Token, Node>()), parent(0), global(0)
-    { }
-    
-    void link(Environment& env)
-    {
-      parent = &env;
-      global = parent->global ? parent->global : parent;
-    }
-    
-    bool query(const Token& key) const
-    {
-      if (current_frame.count(key)) return true;
-      else if (parent)              return parent->query(key);
-      else                          return false;
-    }
-    
-    Node& operator[](const Token& key)
-    {
-      if (current_frame.count(key)) return current_frame[key];
-      else if (parent)              return (*parent)[key];
-      else                          return current_frame[key];
-    }
-  };
-
   struct Context {
     Environment global_env;
     map<string, Function> function_env;
@@ -59,9 +37,9 @@ namespace Sass {
     void collect_include_paths(const char* paths_str);
     Context(const char* paths_str = 0, const char* img_path_str = 0);
     ~Context();
-    
-    void register_function(Function_Descriptor d, Primitive ip);
-    void register_function(Function_Descriptor d, Primitive ip, size_t arity);
+
+    void register_function(Signature sig, Primitive ip);
+    void register_function(Signature sig, Primitive ip, size_t arity);
     void register_overload_stub(string name);
     void register_functions();
     void setup_color_map();

document.cpp

@@ -67,7 +67,7 @@ namespace Sass {
 
     Document doc(ctx);
     doc.path        = path;
-    doc.line = 1;
+    doc.line        = 1;
     doc.root        = ctx.new_Node(Node::root, path, 1, 0);
     doc.lexed       = Token::make();
     doc.own_source  = true;

document.hpp

@@ -1,14 +1,16 @@
+#define SASS_DOCUMENT
+
 #include <map>
 
-#ifndef SASS_PRELEXER_INCLUDED
+#ifndef SASS_PRELEXER
 #include "prelexer.hpp"
 #endif
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif
 
-#ifndef SASS_CONTEXT_INCLUDED
+#ifndef SASS_CONTEXT
 #include "context.hpp"
 #endif
 
@@ -130,10 +132,10 @@ namespace Sass {
     Node parse_mixin_definition();
     Node parse_function_definition();
     Node parse_parameters();
-    Node parse_parameter();
+    Node parse_parameter(Node::Type);
     Node parse_mixin_call();
     Node parse_arguments();
-    Node parse_argument();
+    Node parse_argument(Node::Type);
     Node parse_assignment();
     Node parse_propset();
     Node parse_ruleset(Selector_Lookahead lookahead, Node::Type inside_of = Node::none);