kumi-parser 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219a0ee4cbe1b140e1adb5f885b95764258bad4ac416ad361167dcdf5464e64b
-  data.tar.gz: db323360955a244c7f6ddbf6cdcd1ae333fc21aa039ce0364ac143789d17f5c5
+  metadata.gz: b23bd39864b3107f7f6e3c7fecf3e3791152e015a23ebe673a3e1aea2cb7553e
+  data.tar.gz: b60284dcb13154d1773f35d3dc4af954f794e31b546f3cd94e37f25bc84a4e1d
 SHA512:
-  metadata.gz: c937eee31a97be97fa71e4830db4f40122acb1aae720fb1dba78a67b1039cc21cd9042d3ae0884d67cda3dbddcf47e6e193a805218d2f68f93946f90649060a2
-  data.tar.gz: 21b2ae87d652bc2ffb66489ea0a504033baaa65c6d74ee9168a7a8420d38de3d04c005b1ae21acc10c49656a3c8dee242a2e47425e007cdb3058b389c40de5f1
+  metadata.gz: 2fdb2049c0b269d1b89a20aa6481df8d199916c55f56fb0ba3fa223abf0f9e531bfa2b0a2c4619b6e676497d1acaaf37565c42114886266b3625ac224cb7121b
+  data.tar.gz: 8e5348e745c4b633ffc1b1b5b853281e83aa09a737593be1bfe70a1149550b5d3bffc85d8b6aae6020320b717a08b8d3cc3940d93d67caec2072676aaec205df

data/lib/kumi/parser/direct_parser.rb

@@ -253,11 +253,11 @@ module Kumi
       # Value declaration: 'value :name, expression' or 'value :name do ... end'
       def parse_value_declaration
         begin
-        value_token = expect_token(:value)
-        name_token = expect_token(:symbol)
-  rescue => e
-  binding.pry
-  end
+          value_token = expect_token(:value)
+          name_token = expect_token(:symbol)
+        rescue StandardError => e
+          binding.pry
+        end
 
         if current_token.type == :do
           expression = parse_cascade_expression
@@ -604,28 +604,30 @@ module Kumi
       end
 
       def parse_hash_pair
-        key_token_type = current_token.type
-        key = case key_token_type
-              when :label, :string
-                value = current_token.value.to_sym if key_token_type == :label
-                advance
-                Kumi::Syntax::Literal.new(value, loc: current_token.location)
-              else
-                raise_parse_error("Hash keys must be symbols (:key) or strings (\"key\"), got #{current_token.type}")
-              end
+        key_token = current_token
 
-        skip_comments_and_newlines
+        key_value =
+          case key_token.type
+          when :label   then key_token.value.to_sym   # render:
+          when :string  then key_token.value          # "0" => ...
+          when :symbol  then key_token.value.to_sym   # optional support for :foo => ...
+          else
+            raise_parse_error('Hash keys must be symbols (:key) or strings ("key")')
+          end
 
-        case current_token.type
-        when :arrow
+        advance
+        key = Kumi::Syntax::Literal.new(key_value, loc: key_token.location)
+
+        skip_comments_and_newlines
+        if current_token.type == :arrow
           advance
         else
-          raise_parse_error("Expected '=>' in hash pair") unless key_token_type == :label
+          # Only labels may omit => (Ruby-style `key:`)
+          raise_parse_error("Expected '=>' in hash pair") unless key_token.type == :label
         end
 
         skip_comments_and_newlines
         value = parse_expression
-
         [key, value]
       end
 

data/lib/kumi/parser/version.rb

@@ -2,6 +2,6 @@
 
 module Kumi
   module Parser
-    VERSION = '0.0.21'
+    VERSION = '0.0.22'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumi-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Kumi Team