haml-edge 2.3.225 → 2.3.226

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.225
+2.3.226

data/VERSION

@@ -1 +1 @@
-2.3.225
+2.3.226

data/lib/haml/exec.rb

@@ -23,7 +23,8 @@ module Haml
         rescue Exception => e
           raise e if @options[:trace] || e.is_a?(SystemExit)
 
-          $stderr.puts e.message
+          $stderr.puts "#{e.class}: #{e.message}"
+          $stderr.puts "  Use --trace for backtrace."
           exit 1
         end
         exit 0

data/lib/sass/script/lexer.rb

@@ -99,7 +99,7 @@ module Sass
       class << self
         private
         def string_re(open, close)
-          /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|(?=#\{))/
+          /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/
         end
       end
 
@@ -114,8 +114,8 @@ module Sass
         [:single, false] => string_re("'", "'"),
         [:double, true] => string_re('', '"'),
         [:single, true] => string_re('', "'"),
-        [:uri, false] => /url\(#{W}(#{URLCHAR}*?)(#{W}\)|(?=#\{))/,
-        [:uri, true] => /(#{URLCHAR}*?)(#{W}\)|(?=#\{))/,
+        [:uri, false] => /url\(#{W}(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        [:uri, true] => /(#{URLCHAR}*?)(#{W}\)|#\{)/,
       }
 
       # @param str [String, StringScanner] The source text to lex
@@ -251,10 +251,13 @@ module Sass
 
       def string(re, open)
         return unless scan(STRING_REGULAR_EXPRESSIONS[[re, open]])
-        @interpolation_stack << re if @scanner[2].empty? # Started an interpolated section
+        if @scanner[2] == '#{' #'
+          @scanner.pos -= 2 # Don't actually consume the #{
+          @interpolation_stack << re
+        end
         str =
           if re == :uri
-            Script::String.new("#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2].empty?}")
+            Script::String.new("#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2] == '#{'}")
           else
             Script::String.new(@scanner[1].gsub(/\\(['"]|\#\{)/, '\1'), :string)
           end

data/lib/sass/scss/parser.rb

@@ -645,7 +645,11 @@ MESSAGE
 
         mid_re = Sass::Script::Lexer::STRING_REGULAR_EXPRESSIONS[[type, true]]
         # @scanner[2].empty? means we've started an interpolated section
-        res << expr!(:interpolation) << tok(mid_re) while @scanner[2].empty?
+        while @scanner[2] == '#{'
+          @scanner.pos -= 2 # Don't consume the #{
+          res.last.slice!(-2..-1)
+          res << expr!(:interpolation) << tok(mid_re)
+        end
         res
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.225
+  version: 2.3.226
 platform: ruby
 authors: 
 - Nathan Weizenbaum