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

interpolation.scss

@@ -34,3 +34,9 @@ div {
   d: d;
   + bar;
 }
+
+div {
+  color: blah blah;
+  *color: blah bloo;
+  _color: foo boo;
+}
\ No newline at end of file

sassc.c

-// 
-//   This is when you want to compile a whole folder of stuff
-// 
-// var opts = sass_new_context();
-// opts->sassPath = "/Users/hcatlin/dev/asset/stylesheet";
-// opts->cssPath = "/Users/hcatlin/dev/asset/stylesheets/.css";
-// opts->includePaths = "/Users/hcatlin/dev/asset/stylesheets:/Users/hcatlin/sasslib";
-// opts->outputStyle => SASS_STYLE_COMPRESSED;
-// sass_compile(opts, &callbackfunction);
-// 
-// 
-//   This is when you want to compile a string
-// 
-// opts = sass_new_context();
-// opts->inputString = "a { width: 50px; }";
-// opts->includePaths = "/Users/hcatlin/dev/asset/stylesheets:/Users/hcatlin/sasslib";
-// opts->outputStyle => SASS_STYLE_EXPANDED;
-// var cssResult = sass_compile(opts, &callbackfunction);
-
 #include <stdio.h>
 #include "src/sass_interface.h"
 
 int main(int argc, char** argv)
 {	
 	if (argc < 2) {
-		printf("Hey, I need an input file!\n");
+		printf("Usage: sassc [INPUT FILE]\n");
 		return 0;
 	}
 	
 	struct sass_file_context* ctx = sass_new_file_context();
-	ctx->options.include_paths = "::/blah/bloo/fuzz:/slub/flub/chub::/Users/Aaron/dev/libsass/::::/huzz/buzz:::";
+	ctx->options.include_paths = "";
 	ctx->options.output_style = SASS_STYLE_NESTED;
 	ctx->input_path = argv[1];
 		

src/document_parser.cpp

@@ -498,7 +498,7 @@ namespace Sass {
 
   Node Document::parse_rule() {
     Node rule(Node::rule, context.registry, line_number, 2);
-    if (!lex< identifier >()) syntax_error("invalid property name");
+    if (!lex< sequence< optional< exactly<'*'> >, identifier > >()) syntax_error("invalid property name");
     rule << Node(Node::property, line_number, lexed);
     if (!lex< exactly<':'> >()) syntax_error("property \"" + lexed.to_string() + "\" must be followed by a ':'");
     rule << parse_list();