Implement new output options for tool

Author: mgreter

Build.PL

@@ -211,6 +211,7 @@ my %config = (
         extend.cpp file.cpp output.cpp parser.cpp prelexer.cpp emitter.cpp position.cpp
         sass.cpp sass_interface.cpp sass_functions.cpp sass_values.cpp sass_context.cpp
         source_map.cpp to_c.cpp to_string.cpp units.cpp utf8_string.cpp util.cpp cssize.cpp
+        contextualize_eval.cpp listize.cpp
     ) ]
     },
     config => { ld => 'c++' }, # Need to link with a C++ linker since libsass is C++ (even though the .xs file is not)

bin/psass.pl

@@ -18,8 +18,10 @@
 use File::Slurp qw(write_file);
 
 # load constants from libsass
+use CSS::Sass qw(SASS_STYLE_EXPANDED);
 use CSS::Sass qw(SASS_STYLE_NESTED);
 use CSS::Sass qw(SASS_STYLE_COMPRESSED);
+use CSS::Sass qw(SASS_STYLE_COMPACT);
 use CSS::Sass::Watchdog qw(start_watchdog);
 
 ####################################################################################################
@@ -84,8 +86,12 @@ sub version {
 # parse string to constant
 elsif ($output_style =~ m/^n/i)
 { $output_style = SASS_STYLE_NESTED }
-elsif ($output_style =~ m/^c/i)
+elsif ($output_style =~ m/^compa/i)
+{ $output_style = SASS_STYLE_COMPACT }
+elsif ($output_style =~ m/^compr/i)
 { $output_style = SASS_STYLE_COMPRESSED }
+elsif ($output_style =~ m/^e/i)
+{ $output_style = SASS_STYLE_EXPANDED }
 # die with message if style is unknown
 else { die "unknown output style: $output_style" }
 
@@ -197,7 +203,7 @@ =head1 SYNOPSIS
    -w, --watch                   start watchdog mode
    -p, --precision               precision for float output
    -o, --output-file=file        output file to write result to
-   -t, --output-style=style      output style [nested|compressed]
+   -t, --output-style=style      output style [expanded|nested|compressed|compact]
    -L, --plugin-path=path        plugin load path (repeatable)
    -I, --include-path=path       sass include path (repeatable)
    -c, --source-comments         enable source debug comments

lib/CSS/Sass.xs

@@ -364,8 +364,8 @@ struct Sass_Import** sass_importer(const char* url, const char* prev, void* cook
             char* source = 0;
             char* mapjson = 0;
             char* error_msg = 0;
-            size_t error_line = 0;
-            size_t error_column = 0;
+            size_t error_line = -1;
+            size_t error_column = -1;
 
             // get the entry from the array
             // can either be another array or a path string
@@ -579,6 +579,7 @@ void finalize_sass_context(struct Sass_Context* ctx, HV* RETVAL, SV* err)
     size_t error_column = sass_context_get_error_column(ctx);
     const char* error_text = sass_context_get_error_text(ctx);
     const char* error_message = sass_context_get_error_message(ctx);
+    const char* error_src = 0; // sass_context_get_error_src(ctx);
     const char* output_string = sass_context_get_output_string(ctx);
     const char* source_map_string = sass_context_get_source_map_string(ctx);
     char** included_files = sass_context_get_included_files(ctx);
@@ -595,6 +596,7 @@ void finalize_sass_context(struct Sass_Context* ctx, HV* RETVAL, SV* err)
     hv_stores(RETVAL, "source_map_string", source_map_string ? newSVpv(source_map_string, 0) : newSV(0));
     hv_stores(RETVAL, "error_line",        SvOK(err) ? err : error_line ? newSViv(error_line) : newSViv(0));
     hv_stores(RETVAL, "error_column",      SvOK(err) ? err : error_column ? newSViv(error_column) : newSViv(0));
+    hv_stores(RETVAL, "error_src",         SvOK(err) ? err : error_src ? newSVpv(error_src, 0) : newSViv(0));
     hv_stores(RETVAL, "error_text",        SvOK(err) ? err : error_text ? newSVpv(error_text, 0) : newSV(0));
     hv_stores(RETVAL, "error_message",     SvOK(err) ? err : error_message ? newSVpv(error_message, 0) : newSV(0));
     hv_stores(RETVAL, "error_json",        SvOK(err) ? err : error_json ? newSVpv(error_json, 0) : newSV(0));