Update to latest libsass version (3.2.0-beta.3)

Add benchmark options to cli and test runner

Author: mgreter

Build.PL

@@ -211,7 +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
+        contextualize_eval.cpp listize.cpp lexer.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

@@ -41,6 +41,7 @@
 
 # init options
 my $watchdog;
+my $benchmark;
 my $precision;
 my $output_file;
 my $output_style;
@@ -69,8 +70,9 @@ sub version {
 # get options
 GetOptions (
 	'help|h' => sub { pod2usage(1); },
-	'watch|w' => \ $watchdog,
+	'watch|w!' => \ $watchdog,
 	'version|v' => \ &version,
+	'benchmark|b!' => \ $benchmark,
 	'indent=s' => \ $indent,
 	'linefeed=s' => \ $linefeed,
 	'precision|p=s' => \ $precision,
@@ -117,6 +119,9 @@ sub version {
 if (defined $ARGV[1] && $ARGV[1] ne '-')
 { $output_file = $ARGV[1]; }
 
+# check if the benchmark module is available
+if ($benchmark && ! eval "use Benchmark; 1" )
+{ die "Error loading Benchmark module\n", $@; }
 
 ####################################################################################################
 # get sass standard option list
@@ -154,6 +159,9 @@ ()
 	# variables
 	my ($css, $err, $stats);
 
+	# get benchmark stamp before compiling
+	my $t0 = $benchmark ? Benchmark->new : 0;
+
 	# open filehandle if path is given
 	if (defined $ARGV[0] && $ARGV[0] ne '-')
 	{
@@ -169,6 +177,11 @@ ()
 		);
 	}
 
+	# get benchmark stamp after compiling
+	my $t1 = $benchmark ? Benchmark->new : 0;
+	# only print benchmark result when module is available
+	if ($benchmark) { print timestr(timediff($t1, $t0)), "\n"; }
+
 	# process return status values
 	if (defined $css)
 	{
@@ -233,6 +246,7 @@ =head1 SYNOPSIS
    -s, --source-map-contents     include original contents
    -m, --source-map-file=file    create and write source-map to file
        --no-source-map-url       omit sourceMappingUrl from output
+       --benchmark               print benchmark for compilation time
 
 =head1 OPTIONS
 

lib/CSS/Sass/Watchdog.pm

@@ -20,7 +20,7 @@ our @EXPORT = qw(start_watchdog); # symbols to export by default
 use List::MoreUtils qw(uniq);
 
 # check if the benchmark module is available
-my $benchmark = eval { use Benchmark; 1 };
+my $benchmark = eval "use Benchmark; 1";
 
 # declare package variables
 my ($parent_pid, $child_pid) = ($$, 0);

libsass

@@ -176,6 +176,12 @@ while (scalar(@running)) {
 	} @running;
 }
 
+# check if the benchmark module is available
+my $benchmark = eval "use Benchmark; 1" ;
+
+# get benchmark stamp before compiling
+my $t0 = $benchmark ? Benchmark->new : 0;
+
 foreach my $test (@tests)
 {
 
@@ -296,7 +302,15 @@ foreach my $test (@tests)
 	}
 
 }
+
+# get benchmark stamp after compiling
+my $t1 = $benchmark ? Benchmark->new : 0;
+
 END {
+
+	# only print benchmark result when module is available
+	if ($benchmark) { warn "\nin ", timestr(timediff($t1, $t0)), "\n"; }
+
 	foreach my $surprise (@surprises)
 	{
 		printf STDERR "surprise: %s\n", $surprise->[0];