kumi-parser 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e8f52b91ed0f66c7bdc49935483a81a5f329cec5ef5914555a57c6200b48ad7
-  data.tar.gz: 3b52cc1430c0924cfc4a88f7facb2f022f51ef91ffdc94441b073d2dbde1866e
+  metadata.gz: 7dbd29c99827160178d8ebaebc68ada7b754f2ecdbc99d5c204dc6396431e18f
+  data.tar.gz: cef86a4ebd6b3398d70255a9111832ad9094626da74936e3d858fcba41999efa
 SHA512:
-  metadata.gz: 28dbc7918ed27110f6922286d36151ee00867a2a3d2afb8b20895fe12ddff5c3695b7dfa17058ce6a3638ddb43ca673661c85e586f31a6be4e94a7ea6364a1d7
-  data.tar.gz: 74e0285aa3c6df1b0a41dd6ace23f60421202835f3d864089bcbc6fa6594dc6f0bc25b4db429cfff2880b633e63836e8b402195ce5db2e9d312cf5c622688fbf
+  metadata.gz: af373812dec2bc63ffa5279d5f7adbd2c852f272969dcec65196ddca750d965dbe8b37496f99004975e1a2dbbabac3e7f5cfc5e348bd16b51b2a1261315b97eb
+  data.tar.gz: b3faf218a65da205f4f20651e808dcbfc32bd8ace3a63a479aa576909bcb0f0e9ea066fab04d8013a4046faaa0332a8cf5e223f8f785d8652518d7b89134168e

data/README.md

@@ -58,7 +58,15 @@ end
 
 **Function calls**: `fn(:name, arg1, arg2, ...)`  
 **Operators**: `+` `-` `*` `/` `%` `>` `<` `>=` `<=` `==` `!=` `&` `|`  
-**References**: `input.field`, `value_name`, `array[index]`
+**References**: `input.field`, `value_name`, `array[index]`  
+**Strings**: Both `"double"` and `'single'` quotes supported  
+**Element syntax**: `element :type, :name` for array element specifications
+
+## Ruby DSL Differences
+
+**String concatenation**: Ruby DSL evaluates `"Hello" + "World"` → `Literal("HelloWorld")`, text parser → `CallExpression(:add, [...])`.
+
+**Semantically equivalent** - both should execute identically.
 
 ## Architecture
 
@@ -66,8 +74,6 @@ end
 - `direct_ast_parser.rb` - Recursive descent parser, direct AST construction
 - `token_metadata.rb` - Token types, precedence, and semantic hints
 
-See `docs/` for technical details.
-
 ## License
 
 MIT

data/lib/kumi/parser/direct_parser.rb

@@ -110,7 +110,17 @@ module Kumi
         end
 
         advance
-        name_token = expect_token(:symbol)
+        
+        # Handle element syntax: element :type, :name
+        if type_token.metadata[:type_name] == :element
+          element_type_token = expect_token(:symbol)
+          expect_token(:comma)
+          name_token = expect_token(:symbol)
+          actual_type = element_type_token.value
+        else
+          name_token = expect_token(:symbol)
+          actual_type = type_token.metadata[:type_name]
+        end
 
         # Handle domain specification: ', domain: [...]'
         domain = nil
@@ -126,9 +136,9 @@ module Kumi
           end
         end
 
-        # Handle nested array and hash declarations
+        # Handle nested array, hash, and element declarations
         children = []
-        if %i[array hash].include?(type_token.metadata[:type_name]) && current_token.type == :do
+        if %i[array hash element].include?(actual_type) && current_token.type == :do
           advance # consume 'do'
           skip_comments_and_newlines
 
@@ -147,7 +157,7 @@ module Kumi
           Kumi::Syntax::InputDeclaration.new(
             name_token.value,
             domain,
-            type_token.metadata[:type_name],
+            actual_type,
             children,
             loc: type_token.location
           )
@@ -155,7 +165,7 @@ module Kumi
           Kumi::Syntax::InputDeclaration.new(
             name_token.value,
             domain,
-            type_token.metadata[:type_name],
+            actual_type,
             children,
             :field,
             loc: type_token.location
@@ -273,18 +283,35 @@ module Kumi
         Kumi::Syntax::CascadeExpression.new(cases, loc: start_token.location)
       end
 
-      # Case expression: 'on condition, result' or 'base result'
+      # Case expression: 'on condition1, condition2, ..., result' or 'base result'
       def parse_case_expression
         case current_token.type
         when :on
           on_token = advance_and_return_token
-          condition = parse_expression
-
-          # Wrap simple trait references in cascade_and to match Ruby DSL behavior
-          condition = wrap_condition_in_all(condition) if simple_trait_reference?(condition)
-
-          expect_token(:comma)
-          result = parse_expression
+          
+          # Parse all comma-separated expressions
+          expressions = []
+          expressions << parse_expression
+          
+          # Continue parsing comma-separated expressions until end of case
+          while current_token.type == :comma
+            advance # consume comma
+            expressions << parse_expression
+          end
+          
+          # Last expression is the result, all others are conditions
+          result = expressions.pop
+          conditions = expressions
+          
+          # Combine conditions appropriately
+          if conditions.length == 1
+            condition = conditions[0]
+            # Wrap simple trait references in cascade_and to match Ruby DSL behavior
+            condition = wrap_condition_in_all(condition) if simple_trait_reference?(condition)
+          else
+            # Multiple conditions: combine with cascade_and
+            condition = Kumi::Syntax::CallExpression.new(:cascade_and, conditions, loc: on_token.location)
+          end
 
           Kumi::Syntax::CaseExpression.new(condition, result, loc: on_token.location)
 
@@ -570,6 +597,7 @@ module Kumi
         condition.is_a?(Kumi::Syntax::DeclarationReference)
       end
 
+
       # Helper method to wrap condition in cascade_and function call
       def wrap_condition_in_all(condition)
         Kumi::Syntax::CallExpression.new(:cascade_and, [condition], loc: condition.loc)

data/lib/kumi/parser/smart_tokenizer.rb

@@ -26,7 +26,7 @@ module Kumi
           when nil then break
           when "\n" then handle_newline
           when '#' then consume_comment
-          when '"' then consume_string
+          when '"', "'" then consume_string
           when /\d/ then consume_number
           when '-'
             if peek_char && peek_char.match?(/\d/)
@@ -95,10 +95,11 @@ module Kumi
 
       def consume_string
         start_column = @column
+        quote_char = current_char # Remember which quote type we're using
         advance # skip opening quote
 
         string_content = ''
-        while current_char && current_char != '"'
+        while current_char && current_char != quote_char
           if current_char == '\\'
             advance
             # Handle escape sequences
@@ -108,6 +109,7 @@ module Kumi
             when 'r' then string_content += "\r"
             when '\\' then string_content += '\\'
             when '"' then string_content += '"'
+            when "'" then string_content += "'"
             else
               string_content += current_char if current_char
             end
@@ -117,7 +119,7 @@ module Kumi
           advance
         end
 
-        raise_tokenizer_error('Unterminated string literal') if current_char != '"'
+        raise_tokenizer_error('Unterminated string literal') if current_char != quote_char
 
         advance # skip closing quote
 

data/lib/kumi/parser/token_metadata.rb

@@ -32,6 +32,7 @@ module Kumi
       BOOLEAN_TYPE = :boolean_type   # boolean
       ANY_TYPE = :any_type           # any
       ARRAY_TYPE = :array_type       # array
+      ELEMENT_TYPE = :element_type   # element
 
       # Function keywords
       FN = :fn
@@ -149,6 +150,11 @@ module Kumi
         starts_declaration: true,
         type_name: :hash
       },
+      element_type: {
+        category: :type_keyword,
+        starts_declaration: true,
+        type_name: :element
+      },
 
       # Function keyword
       fn: {
@@ -385,7 +391,8 @@ module Kumi
       'boolean' => :boolean_type,
       'any' => :any_type,
       'array' => :array_type,
-      'hash' => :hash_type
+      'hash' => :hash_type,
+      'element' => :element_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.11'
+    VERSION = '0.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumi-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Kumi Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-08-21 00:00:00.000000000 Z
+date: 2025-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kumi