sassc 0.0.9 → 0.0.10

data/ext/libsass/ast_def_macros.hpp

@@ -1,3 +1,6 @@
+#ifndef SASS_AST_DEF_MACROS_H
+#define SASS_AST_DEF_MACROS_H
+
 #define ATTACH_OPERATIONS()\
 virtual void perform(Operation<void>* op) { (*op)(this); }\
 virtual AST_Node* perform(Operation<AST_Node*>* op) { return (*op)(this); }\
@@ -14,3 +17,5 @@ public:\
   type name() const        { return name##_; }\
   type name(type name##__) { return name##_ = name##__; }\
 private:
+
+#endif

data/ext/libsass/ast_factory.hpp

@@ -1,10 +1,9 @@
-#define SASS_AST_FACTORY
+#ifndef SASS_AST_FACTORY_H
+#define SASS_AST_FACTORY_H
 
 #include <vector>
 
-#ifndef SASS_AST
 #include "ast.hpp"
-#endif
 
 namespace Sass {
   using namespace std;
@@ -18,7 +17,9 @@ namespace Sass {
     Propset* new_Propset(string p, size_t l, String* pf, Block* b);
     Feature_Query* new_Feature_Query(string p, size_t l, Feature_Query* f, Block* b);
     Media_Query* new_Media_Query(string p, size_t l, List* q, Block* b);
+    At_Root_Block* new_At_Root_Block(string p, size_t l, Selector* sel, Block* b);
     At_Rule* new_At_Rule(string p, size_t l, string kwd, Selector* sel, Block* b);
+    Keyframe_Rule* new_Keyframe_Rule(string p, size_t l, Block* b);
     Declaration* new_Declaration(string p, size_t l, String* prop, List* vals);
     Assignment* new_Assignment(string p, size_t l, string var, Expression* val, bool guarded = false);
     Import<Function_Call*>* new_CSS_Import(string p, size_t l, Function_Call* loc);
@@ -85,3 +86,5 @@ namespace Sass {
     Selector_List* new_Selector_List(string p, size_t l, size_t s = 0);
   };
 }
+
+#endif

data/ext/libsass/ast_fwd_decl.hpp

@@ -1,17 +1,25 @@
+#ifndef SASS_AST_FWD_DECL_H
+#define SASS_AST_FWD_DECL_H
+
 /////////////////////////////////////////////
 // Forward declarations for the AST visitors.
 /////////////////////////////////////////////
 namespace Sass {
 
+  enum Output_Style { NESTED, EXPANDED, COMPACT, COMPRESSED, FORMATTED };
+
   class AST_Node;
   // statements
   class Statement;
   class Block;
   class Ruleset;
   class Propset;
+  class Bubble;
   class Media_Block;
   class Feature_Block;
   class At_Rule;
+  class Keyframe_Rule;
+  class At_Root_Block;
   class Declaration;
   class Assignment;
   class Import;
@@ -45,10 +53,12 @@ namespace Sass {
   class String_Schema;
   class String;
   class String_Constant;
+  class String_Quoted;
   class Media_Query;
   class Media_Query_Expression;
   class Feature_Query;
   class Feature_Query_Condition;
+  class At_Root_Expression;
   class Null;
   // parameters and arguments
   class Parameter;
@@ -70,3 +80,5 @@ namespace Sass {
   class Selector_List;
 
 }
+
+#endif

data/ext/libsass/b64/encode.h

@@ -12,7 +12,7 @@ For details, see http://sourceforge.net/projects/libb64
 
 namespace base64
 {
-	extern "C" 
+	extern "C"
 	{
 		#include "cencode.h"
 	}
@@ -54,7 +54,7 @@ namespace base64
 			do
 			{
 				istream_in.read(plaintext, N);
-				plainlength = istream_in.gcount();
+				plainlength = static_cast<int>(istream_in.gcount());
 				//
 				codelength = encode(plaintext, plainlength, code);
 				ostream_in.write(code, codelength);

data/ext/libsass/backtrace.hpp

@@ -1,14 +1,10 @@
-#define SASS_BACKTRACE
+#ifndef SASS_BACKTRACE_H
+#define SASS_BACKTRACE_H
 
 #include <sstream>
 
-#ifndef SASS_POSITION
-#include "position.hpp"
-#endif
-
-#ifndef SASS_FILE
 #include "file.hpp"
-#endif
+#include "position.hpp"
 
 namespace Sass {
 
@@ -16,15 +12,13 @@ namespace Sass {
 
   struct Backtrace {
 
-    Backtrace* parent;
-    string     path;
-    Position   position;
-    string     caller;
+    Backtrace*  parent;
+    ParserState pstate;
+    string      caller;
 
-    Backtrace(Backtrace* prn, string pth, Position position, string c)
+    Backtrace(Backtrace* prn, ParserState pstate, string c)
     : parent(prn),
-      path(pth),
-      position(position),
+      pstate(pstate),
       caller(c)
     { }
 
@@ -40,14 +34,14 @@ namespace Sass {
       while (this_point->parent) {
 
         // make path relative to the current directory
-        string rel_path(Sass::File::resolve_relative_path(this_point->path, cwd, cwd));
+        string rel_path(Sass::File::resolve_relative_path(this_point->pstate.path, cwd, cwd));
 
         if (warning) {
           ss << endl
              << "\t"
              << (++i == 0 ? "on" : "from")
              << " line "
-             << this_point->position.line
+             << this_point->pstate.line
              << " of "
              << rel_path;
         } else {
@@ -55,7 +49,7 @@ namespace Sass {
              << "\t"
              << rel_path
              << ":"
-             << this_point->position.line
+             << this_point->pstate.line
              << this_point->parent->caller;
         }
 
@@ -79,3 +73,5 @@ namespace Sass {
   };
 
 }
+
+#endif

data/ext/libsass/base64vlq.hpp

@@ -1,4 +1,5 @@
-#define SASS_BASE64VLQ
+#ifndef SASS_BASE64VLQ_H
+#define SASS_BASE64VLQ_H
 
 #include <string>
 
@@ -26,3 +27,5 @@ namespace Sass {
   };
 
 }
+
+#endif

data/ext/libsass/bind.cpp

@@ -32,7 +32,7 @@ namespace Sass {
         stringstream msg;
         msg << callee << " only takes " << LP << " arguments; "
             << "given " << LA;
-        error(msg.str(), as->path(), as->position());
+        error(msg.str(), as->pstate());
       }
       Parameter* p = (*ps)[ip];
       Argument*  a = (*as)[ia];
@@ -51,16 +51,14 @@ namespace Sass {
         } else {
 
           // copy all remaining arguments into the rest parameter, preserving names
-          List* arglist = new (ctx.mem) List(p->path(),
-                                             p->position(),
+          List* arglist = new (ctx.mem) List(p->pstate(),
                                              0,
                                              List::COMMA,
                                              true);
           env->current_frame()[p->name()] = arglist;
           while (ia < LA) {
             a = (*as)[ia];
-            (*arglist) << new (ctx.mem) Argument(a->path(),
-                                                 a->position(),
+            (*arglist) << new (ctx.mem) Argument(a->pstate(),
                                                  a->value(),
                                                  a->name(),
                                                  false);
@@ -84,7 +82,7 @@ namespace Sass {
           a = static_cast<Argument*>((*arglist)[0]);
         } else {
           Expression* a_to_convert = (*arglist)[0];
-          a = new (ctx.mem) Argument(a_to_convert->path(), a_to_convert->position(), a_to_convert, "", false);
+          a = new (ctx.mem) Argument(a_to_convert->pstate(), a_to_convert, "", false);
         }
         arglist->elements().erase(arglist->elements().begin());
         if (!arglist->length() || (!arglist->is_arglist() && ip + 1 == LP)) {
@@ -99,7 +97,7 @@ namespace Sass {
           if (!param_map.count(name)) {
             stringstream msg;
             msg << callee << " has no parameter named " << name;
-            error(msg.str(), a->path(), a->position());
+            error(msg.str(), a->pstate());
           }
           env->current_frame()[name] = argmap->at(key);
         }
@@ -114,7 +112,7 @@ namespace Sass {
           stringstream msg;
           msg << "parameter " << p->name()
           << " provided more than once in call to " << callee;
-          error(msg.str(), a->path(), a->position());
+          error(msg.str(), a->pstate());
         }
         // ordinal arg -- bind it to the next param
         env->current_frame()[p->name()] = a->value();
@@ -125,19 +123,19 @@ namespace Sass {
         if (!param_map.count(a->name())) {
           stringstream msg;
           msg << callee << " has no parameter named " << a->name();
-          error(msg.str(), a->path(), a->position());
+          error(msg.str(), a->pstate());
         }
         if (param_map[a->name()]->is_rest_parameter()) {
           stringstream msg;
           msg << "argument " << a->name() << " of " << callee
               << "cannot be used as named argument";
-          error(msg.str(), a->path(), a->position());
+          error(msg.str(), a->pstate());
         }
         if (env->current_frame_has(a->name())) {
           stringstream msg;
           msg << "parameter " << p->name()
               << "provided more than once in call to " << callee;
-          error(msg.str(), a->path(), a->position());
+          error(msg.str(), a->pstate());
         }
         env->current_frame()[a->name()] = a->value();
       }
@@ -147,15 +145,14 @@ namespace Sass {
     // That's only okay if they have default values, or were already bound by
     // named arguments, or if it's a single rest-param.
     for (size_t i = ip; i < LP; ++i) {
-      To_String to_string;
+      To_String to_string(&ctx);
       Parameter* leftover = (*ps)[i];
       // cerr << "env for default params:" << endl;
       // env->print();
       // cerr << "********" << endl;
       if (!env->current_frame_has(leftover->name())) {
         if (leftover->is_rest_parameter()) {
-          env->current_frame()[leftover->name()] = new (ctx.mem) List(leftover->path(),
-                                                                      leftover->position(),
+          env->current_frame()[leftover->name()] = new (ctx.mem) List(leftover->pstate(),
                                                                       0,
                                                                       List::COMMA,
                                                                       true);
@@ -175,7 +172,7 @@ namespace Sass {
           stringstream msg;
           msg << "required parameter " << leftover->name()
               << " is missing in call to " << callee;
-          error(msg.str(), as->path(), as->position());
+          error(msg.str(), as->pstate());
         }
       }
     }

data/ext/libsass/bind.hpp

@@ -1,18 +1,18 @@
-#define SASS_BIND
-
-#ifndef SASS_ENVIRONMENT
-#include "environment.hpp"
-#endif
+#ifndef SASS_BIND_H
+#define SASS_BIND_H
 
 #include <string>
+#include "environment.hpp"
 
 namespace Sass {
   class   AST_Node;
   class   Parameters;
   class   Arguments;
-  struct  Context;
+  class   Context;
   class   Eval;
   typedef Environment<AST_Node*> Env;
 
   void bind(string caller, Parameters*, Arguments*, Context&, Env*, Eval*);
 }
+
+#endif

data/ext/libsass/color_names.hpp

@@ -1,4 +1,5 @@
-#define SASS_COLOR_NAMES
+#ifndef SASS_COLOR_NAMES_H
+#define SASS_COLOR_NAMES_H
 
 namespace Sass {
 
@@ -322,3 +323,5 @@ namespace Sass {
   };
 
 }
+
+#endif

data/ext/libsass/configure.ac

@@ -2,7 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([libsass], [3.0.3], [support@moovweb.com])
+
+AC_INIT([libsass], m4_esyscmd_s([./version.sh]), [support@moovweb.com])
 AC_CONFIG_SRCDIR([ast.hpp])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -62,7 +63,7 @@ the --with-sass-spec-dir=<dir> argument.
   # Automake doesn't like its tests in an absolute path, so we make it relative.
   case $sass_spec_dir in
     /*)
-      SASS_SPEC_PATH=`$RUBY -e "require 'pathname';puts Pathname.new('$sass_spec_dir').relative_path_from(Pathname.new('$PWD')).to_s"`
+      SASS_SPEC_PATH=`$RUBY -e "require 'pathname'; puts Pathname.new('$sass_spec_dir').relative_path_from(Pathname.new('$PWD')).to_s"`
       ;;
     *)
       SASS_SPEC_PATH="$sass_spec_dir"
@@ -106,25 +107,10 @@ fi
 
 AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_cov" = "xyes")
 
-AC_ARG_VAR(LIBSASS_VERSION, libsass version)
-if test "x$LIBSASS_VERSION" = "x"; then
-  AC_CHECK_PROG(GIT, git, git)
-  if test "x$GIT" = "x"; then
-    LIBSASS_VERSION=$VERSION
-  else
-    AC_CHECK_FILE(.git/config, [
-      LIBSASS_VERSION=`$GIT describe --abbrev=4 --dirty --always --tags`
-    ], [
-      LIBSASS_VERSION=$VERSION
-    ])
-  fi
-  if test "x$LIBSASS_VERSION" = "x"; then
-    AC_MSG_ERROR([LIBSASS_VERSION not defined.
-You can solve this by setting LIBSASS_VERSION:
-# export LIBSASS_VERSION="x.y.z"
-])
-  fi
-fi
+AS_CASE([$host], [*-*-mingw32], [is_mingw32=yes], [is_mingw32=no])
+AM_CONDITIONAL(COMPILER_IS_MINGW32, test "x$is_mingw32" = "xyes")
+
+AC_MSG_NOTICE([Building libsass ($VERSION)])
 
 AC_CONFIG_FILES([Makefile support/libsass.pc])
 AC_OUTPUT

data/ext/libsass/constants.cpp

@@ -4,10 +4,8 @@ namespace Sass {
   namespace Constants {
     extern const int SPECIFICITY_BASE = 1000;
 
-    // hidden variable name for the image path (for the image-url built-in)
-    extern const char image_path_var[] = "$[image path]";
-
     // sass keywords
+    extern const char at_root_kwd[]       = "@at-root";
     extern const char import_kwd[]        = "@import";
     extern const char mixin_kwd[]         = "@mixin";
     extern const char function_kwd[]      = "@function";
@@ -32,6 +30,10 @@ namespace Sass {
     extern const char global_kwd[]        = "global";
     extern const char null_kwd[]          = "null";
     extern const char optional_kwd[]      = "optional";
+    extern const char with_kwd[]          = "with";
+    extern const char without_kwd[]       = "without";
+    extern const char all_kwd[]           = "all";
+    extern const char rule_kwd[]          = "rule";
 
     // css standard units
     extern const char em_kwd[]   = "em";
@@ -65,7 +67,6 @@ namespace Sass {
     extern const char only_kwd[]         = "only";
     extern const char rgb_kwd[]          = "rgb(";
     extern const char url_kwd[]          = "url(";
-    extern const char image_url_kwd[]    = "image-url(";
     extern const char important_kwd[]    = "important";
     extern const char pseudo_not_kwd[]   = ":not(";
     extern const char even_kwd[]         = "even";
@@ -75,6 +76,7 @@ namespace Sass {
     extern const char calc_kwd[]         = "calc(";
     extern const char moz_calc_kwd[]     = "-moz-calc(";
     extern const char webkit_calc_kwd[]  = "-webkit-calc(";
+    extern const char ms_calc_kwd[]      = "-ms-calc(";
 
     // css attribute-matching operators
     extern const char tilde_equal[]  = "~=";

data/ext/libsass/constants.hpp

@@ -1,13 +1,12 @@
-#define SASS_CONSTANTS
+#ifndef SASS_CONSTANTS_H
+#define SASS_CONSTANTS_H
 
 namespace Sass {
   namespace Constants {
     extern const int SPECIFICITY_BASE;
 
-    // hidden variable name for the image path (for the image-url built-in)
-    extern const char image_path_var[];
-
     // sass keywords
+    extern const char at_root_kwd[];
     extern const char import_kwd[];
     extern const char mixin_kwd[];
     extern const char function_kwd[];
@@ -32,6 +31,10 @@ namespace Sass {
     extern const char global_kwd[];
     extern const char null_kwd[];
     extern const char optional_kwd[];
+    extern const char with_kwd[];
+    extern const char without_kwd[];
+    extern const char all_kwd[];
+    extern const char rule_kwd[];
 
     // css standard units
     extern const char em_kwd[];
@@ -75,6 +78,7 @@ namespace Sass {
     extern const char calc_kwd[];
     extern const char moz_calc_kwd[];
     extern const char webkit_calc_kwd[];
+    extern const char ms_calc_kwd[];
 
     // css attribute-matching operators
     extern const char tilde_equal[];
@@ -143,3 +147,5 @@ namespace Sass {
 
   }
 }
+
+#endif