haml 3.0.3 → 3.0.4

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

data/lib/sass/script/parser.rb

@@ -265,7 +265,7 @@ RUBY
       def fn_arglist
         return unless e = equals
         return [e] unless try_tok(:comma)
-        [e, *fn_arglist]
+        [e, *assert_expr(:fn_arglist)]
       end
 
       def arglist
@@ -334,6 +334,7 @@ RUBY
         :string => "string",
         :default => "expression (e.g. 1px, bold)",
         :arglist => "mixin argument",
+        :fn_arglist => "function argument",
       }
 
       def assert_expr(name)

data/lib/sass/scss/rx.rb

@@ -116,8 +116,8 @@ module Sass
       # Can't use IDENT here, because it seems to take exponential time on 1.8.
       # We could use it for 1.9 only, but I don't want to introduce a cross-version
       # behavior difference.
-      # There aren't really any plain-CSS single-character identifiers anyway.
-      STATIC_VALUE = /(-?#{NMSTART}#{NMCHAR}+|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
+      # In any case, almost all CSS idents will be matched by this.
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
 
       STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
     end

data/test/sass/script_test.rb

@@ -329,6 +329,11 @@ SASS
     assert_equal "#2", resolve('"##{1 + 1}"')
   end
 
+  def test_misplaced_comma_in_funcall
+    assert_raise(Sass::SyntaxError,
+      'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
+  end
+
   private
 
   def resolve(str, opts = {}, environment = env)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Nathan Weizenbaum