kumi-parser 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea2c2266d25647fdc1bfe6a5a773655a4e78baf79062507589209ed3243b6870
-  data.tar.gz: 25bf84670d568126b14cdcd181bcb89f373b394d4afbd1a3dbf55042e0283c44
+  metadata.gz: 219a0ee4cbe1b140e1adb5f885b95764258bad4ac416ad361167dcdf5464e64b
+  data.tar.gz: db323360955a244c7f6ddbf6cdcd1ae333fc21aa039ce0364ac143789d17f5c5
 SHA512:
-  metadata.gz: 2e5ab415f4e8ab3dacf941dabc87e7b782d628ef20e49be2ecd7a570a32722b4b65ef3f73805681ebf80229eba2b1903a487863f06f8ab98a9bf8982a8d77db5
-  data.tar.gz: f9f86ebad3792de667271f64dc3ecd7c28c53c26fb50a15f23cc876be1918581258d0df738c23aa8ee19fee6410f30eb6683b67e658d477a48686d6d093e4017
+  metadata.gz: c937eee31a97be97fa71e4830db4f40122acb1aae720fb1dba78a67b1039cc21cd9042d3ae0884d67cda3dbddcf47e6e193a805218d2f68f93946f90649060a2
+  data.tar.gz: 21b2ae87d652bc2ffb66489ea0a504033baaa65c6d74ee9168a7a8420d38de3d04c005b1ae21acc10c49656a3c8dee242a2e47425e007cdb3058b389c40de5f1

data/.ruby-version

@@ -0,0 +1 @@
+3.3.8

data/lib/kumi/parser/direct_parser.rb

@@ -114,11 +114,15 @@ module Kumi
 
         # element :type, :name  (syntactic sugar: the child was declared via `element`)
         declared_with_element = (type_token.metadata[:type_name] == :element)
+        declared_with_index = (type_token.metadata[:type_name] == :index)
         if declared_with_element
           element_type_token = expect_token(:symbol)
           expect_token(:comma)
           name_token = expect_token(:symbol)
           actual_type = element_type_token.value
+        elsif declared_with_index
+          name_token  = expect_token(:symbol)
+          actual_type = :index
         else
           name_token  = expect_token(:symbol)
           actual_type = type_token.metadata[:type_name]
@@ -151,8 +155,9 @@ module Kumi
 
             # Syntactic decision (NO counting): is this child introduced by `element`?
             child_is_element_keyword = (current_token.metadata[:type_name] == :element)
+            child_is_index_keyword   = (current_token.metadata[:type_name] == :index)
             any_element_children ||= child_is_element_keyword
-            any_field_children   ||= !child_is_element_keyword
+            any_field_children   ||= !child_is_element_keyword && !child_is_index_keyword
 
             children << parse_input_declaration
             skip_comments_and_newlines
@@ -247,8 +252,12 @@ 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
 
         if current_token.type == :do
           expression = parse_cascade_expression
@@ -470,44 +479,89 @@ module Kumi
       end
 
       def parse_function_sugar
-        sugar_token = current_token
-        advance
-        args = parse_argument_list
-        Kumi::Syntax::CallExpression.new(sugar_token.value.to_sym, args, loc: sugar_token.location)
+        sugar = current_token
+        advance # e.g. shift(...)
+        expect_token(:lparen)
+        args, opts = parse_args_and_opts_inside_parens
+        Kumi::Syntax::CallExpression.new(sugar.value.to_sym, args, opts, loc: sugar.location)
       end
 
       def parse_function_call
-        advance
-        if current_token.type == :lparen
+        advance # saw :fn
+        expect_token(:lparen)
+        fn_name_token = expect_token(:symbol) # :shift, :roll, etc.
+        args = []
+        opts = {}
+        if current_token.type == :comma
           advance
-          fn_name_token = expect_token(:symbol)
-          fn_name = fn_name_token.value
-          args = []
-          while current_token.type == :comma
-            advance
-            args << parse_expression
-          end
-          expect_token(:rparen)
-          Kumi::Syntax::CallExpression.new(fn_name, args, loc: fn_name_token.location)
+          args, opts = parse_args_and_opts_inside_parens
+        end
+        # expect_token(:rparen)
+        Kumi::Syntax::CallExpression.new(fn_name_token.value, args, loc: fn_name_token.location, opts: opts)
+      end
+
+      def parse_kw_literal_value
+        t = current_token
+        case t.type
+        when :integer  then advance
+                            t.value.delete('_').to_i
+        when :float    then advance
+                            t.value.delete('_').to_f
+        when :string, :symbol then advance
+                                   t.value
+        when :boolean  then advance
+                            t.value == 'true'
+        when :label    then advance
+                            t.value.to_sym # :wrap, :clamp, etc.
+        when :subtract # allow negatives like -1
+          advance
+          v = parse_kw_literal_value
+          raise_parse_error("numeric after unary '-'") unless v.is_a?(Numeric)
+          -v
         else
-          raise_parse_error("Expected '(' after 'fn'")
+          raise_parse_error('keyword value must be literal/label')
         end
       end
 
-      def parse_argument_list
+      def parse_args_and_opts_inside_parens
         args = []
+        opts = {}
+
+        # expect_token(:lparen)
 
-        expect_token(:lparen)
         unless current_token.type == :rparen
-          args << parse_expression
-          while current_token.type == :comma
-            advance
+          # --- positional args ---
+          unless next_is_kwarg_after_comma?
             args << parse_expression
+            while current_token.type == :comma && !next_is_kwarg_after_comma?
+              advance
+              args << parse_expression
+            end
+          end
+          # --- kwargs (labels like `policy:`) ---
+          if next_is_kwarg_after_comma?
+            # subsequent pairs: `, label value`
+            while current_token.type == :comma
+              # stop if next token is not a kw key
+              advance
+
+              if current_token.type == :label
+                key = current_token.value.to_sym
+                advance
+              end
+              opts[key] = parse_kw_literal_value
+
+              break unless next_is_kwarg_after_comma?
+            end
           end
         end
+
         expect_token(:rparen)
+        [args, opts]
+      end
 
-        args
+      def next_is_kwarg_after_comma?
+        current_token.type == :comma && peek_token.type == :label
       end
 
       def parse_array_literal
@@ -581,6 +635,7 @@ module Kumi
         when :float    then token.value.gsub('_', '').to_f
         when :string   then token.value
         when :boolean  then token.value == 'true'
+        when :symbol   then token.value.to_sym
         when :constant
           case token.value
           when 'Float::INFINITY' then Float::INFINITY

data/lib/kumi/parser/token_metadata.rb

@@ -33,6 +33,7 @@ module Kumi
       ANY_TYPE = :any_type           # any
       ARRAY_TYPE = :array_type       # array
       ELEMENT_TYPE = :element_type   # element
+      INDEX_TYPE = :index_type       # index
 
       # Function keywords
       FN = :fn
@@ -155,6 +156,11 @@ module Kumi
         starts_declaration: true,
         type_name: :element
       },
+      index_type: {
+        category: :type_keyword,
+        starts_declaration: true,
+        type_name: :index
+      },
 
       # Function keyword
       fn: {
@@ -388,7 +394,9 @@ module Kumi
     }.freeze
 
     FUNCTION_SUGAR = {
-      'select' => '__select__'
+      'select' => '__select__',
+      'shift' => 'shift',
+      'roll' => 'roll'
     }
 
     # Keywords mapping
@@ -411,7 +419,8 @@ module Kumi
       'any' => :any_type,
       'array' => :array_type,
       'hash' => :hash_type,
-      'element' => :element_type
+      'element' => :element_type,
+      'index' => :index_type
     }.freeze
 
     # Opener to closer mappings for error recovery

data/lib/kumi/parser/version.rb

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumi-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Kumi Team
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -116,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".ruby-version"
 - CLAUDE.md
 - LICENSE
 - README.md
@@ -147,6 +149,7 @@ metadata:
   homepage_uri: https://github.com/amuta/kumi-parser
   source_code_uri: https://github.com/amuta/kumi-parser
   changelog_uri: https://github.com/amuta/kumi-parser/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -161,7 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key: 
 specification_version: 4
 summary: Text parser for Kumi
 test_files: []