kapusta 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9324827934a0647689027ecf5fc6bf83708fe536cd904dc04d1f9c0594c37581
-  data.tar.gz: 736a8f7d8158fc4502415168f5791d7af8b98f392800255576c1d0182ef920c6
+  metadata.gz: fa363e8e708ddf94ca3406bda52d7603663e9de82a79eec94328082f5310b638
+  data.tar.gz: cf1a0911c16fa481bc1680380eb2677329276289c513e8d66d9f4450cad9d762
 SHA512:
-  metadata.gz: 62e4118362c7fbe7ae034470a01ddf37a0bb826fb142e2611d72b09ded1777e52bf2b078cf48c0283dda6f0a8c5989ec31f60d0913cf16ec3ac9ccabf2c40626
-  data.tar.gz: 5fbd5b3a7809eff626c43203b1c36761efac10cb5663ca345ace26fbea731da63402909be6a04f22aedaca80945e1db3456209a6ac335b8fc4a2152bcc198395
+  metadata.gz: d2e4405abbab87cc70e8b00ab05840f50b6050c965d63351e6db3a2e5ab2f97219bb517d837ef8f8166df27ae4d53d0bd9a595de6bbed3d5e0319de0c13b2a88
+  data.tar.gz: 8e88867b98adba5e17d0eaf6a506518bdb0a7f7b2628d5ce3937fad5f29e73766dba4767340716f06ec7ff3e9b68df6924b7cadf936a71cb18bf47e88a26ca4b

data/lib/kapusta/compiler/emitter/interop.rb

@@ -496,37 +496,8 @@ module Kapusta
           Kapusta.kebab_to_snake(name).gsub(/[^a-zA-Z0-9_]/, '_')
         end
 
-        SIMPLE_EXPRESSION_PATTERNS = [
-          /\A[a-z_]\w*\z/, # local
-          /\A@@?[a-z_]\w*\z/, # @ivar / @@cvar
-          /\A\$[a-zA-Z_]\w*\z/, # $gvar
-          /\A[A-Z]\w*(?:::[A-Z]\w*)*\z/, # Constant / A::B::C
-          /\A[a-z_]\w*[!?=]?\([^()\n]*\)\z/, # bare call foo(...)
-          /\A-?\d+(?:\.\d+)?\z/, # number
-          /\A[a-z_]\w*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/, # local + .m/[k] chain
-          /\A[A-Z]\w*(?:::[A-Z]\w*)*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/, # const + chain
-          /\A\([^()\n]*\)(?:\.[a-zA-Z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/, # (expr).chain
-          /\A:[a-zA-Z_]\w*[!?=]?\z/, # :symbol
-          /\A"(?:[^"\\]|\\.)*"\z/, # "string"
-          /\A'(?:[^'\\]|\\.)*'\z/, # 'string'
-          /\A\[[^\[\]\n]*\]\z/ # [flat, array]
-        ].freeze
-        private_constant :SIMPLE_EXPRESSION_PATTERNS
-
-        SIMPLE_EXPRESSION_KEYWORDS = %w[nil true false self].freeze
-        private_constant :SIMPLE_EXPRESSION_KEYWORDS
-
         def simple_expression?(code)
-          SIMPLE_EXPRESSION_PATTERNS.any? { |re| code.match?(re) } ||
-            SIMPLE_EXPRESSION_KEYWORDS.include?(code) ||
-            negation_simple?(code)
-        end
-
-        def negation_simple?(code)
-          return false unless code.start_with?('!') && code.length > 1
-
-          rest = code[1..]
-          simple_expression?(rest) || (rest.start_with?('(') && rest.end_with?(')'))
+          SimpleExpression.match?(code)
         end
       end
     end

data/lib/kapusta/compiler/emitter/simple_expression.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Kapusta
+  module Compiler
+    module EmitterModules
+      module SimpleExpression
+        module_function
+
+        KEYWORDS = %w[nil true false self].freeze
+
+        OPENERS = { '(' => ')', '[' => ']', '{' => '}' }.freeze
+        CLOSERS = OPENERS.values.freeze
+
+        # `{...}` is intentionally excluded — a top-level hash or block literal
+        # shouldn't be treated as a bare primary even though balanced.
+        PRIMARY_OPENERS = { '(' => ')', '[' => ']' }.freeze
+
+        PRIMARY_PATTERNS = [
+          /\A-?\d+(?:\.\d+)?/, # number (incl. negative literal)
+          /\A:[a-zA-Z_]\w*[!?=]?/, # :symbol
+          /\A"(?:[^"\\]|\\.)*"/, # "string"
+          /\A'(?:[^'\\]|\\.)*'/, # 'string'
+          /\A@@?[a-z_]\w*/, # @ivar / @@cvar
+          /\A\$[a-zA-Z_]\w*/, # $gvar
+          /\A[A-Z]\w*(?:::[A-Z]\w*)*/, # Constant / A::B::C
+          /\A[a-z_]\w*[!?=]?/ # local or bare call head
+        ].freeze
+
+        CHAIN_METHOD = /\A\.[a-zA-Z_]\w*[!?=]?/
+
+        def match?(code)
+          return false if code.empty? || code.include?("\n")
+          return true if KEYWORDS.include?(code)
+          return negation?(code) if code.start_with?('!')
+
+          consume(code, 0) == code.length
+        end
+
+        def negation?(code)
+          return false if code.length < 2
+
+          rest = code[1..]
+          match?(rest) || (rest.start_with?('(') && rest.end_with?(')'))
+        end
+
+        def consume(code, pos)
+          pos = consume_primary(code, pos)
+          while pos && pos < code.length
+            advanced = consume_segment(code, pos)
+            break unless advanced
+
+            pos = advanced
+          end
+          pos
+        end
+
+        def consume_primary(code, pos)
+          return consume_group(code, pos) if PRIMARY_OPENERS.key?(code[pos])
+
+          regex = PRIMARY_PATTERNS.find { |re| code[pos..].match?(re) }
+          return unless regex
+
+          after = pos + regex.match(code[pos..]).end(0)
+          code[after] == '(' ? consume_group(code, after) : after
+        end
+
+        def consume_segment(code, pos)
+          return consume_group(code, pos) if code[pos] == '['
+          return unless code[pos] == '.'
+
+          match = CHAIN_METHOD.match(code[pos..])
+          return unless match
+
+          after = pos + match.end(0)
+          code[after] == '(' ? consume_group(code, after) : after
+        end
+
+        def consume_group(code, pos)
+          return unless OPENERS.key?(code[pos])
+
+          stack = [OPENERS[code[pos]]]
+          pos += 1
+          quote = nil
+          while pos < code.length
+            ch = code[pos]
+            if quote
+              if ch == '\\' && pos + 1 < code.length
+                pos += 2
+              else
+                quote = nil if ch == quote
+                pos += 1
+              end
+            elsif ['"', "'"].include?(ch)
+              quote = ch
+              pos += 1
+            elsif OPENERS.key?(ch)
+              stack.push(OPENERS[ch])
+              pos += 1
+            elsif CLOSERS.include?(ch)
+              return unless stack.last == ch
+
+              stack.pop
+              pos += 1
+              return pos if stack.empty?
+            else
+              pos += 1
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/kapusta/compiler/emitter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'emitter/simple_expression'
 require_relative 'emitter/support'
 require_relative 'emitter/expressions'
 require_relative 'emitter/bindings'

data/lib/kapusta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kapusta
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -153,6 +153,7 @@ files:
 - lib/kapusta/compiler/emitter/expressions.rb
 - lib/kapusta/compiler/emitter/interop.rb
 - lib/kapusta/compiler/emitter/patterns.rb
+- lib/kapusta/compiler/emitter/simple_expression.rb
 - lib/kapusta/compiler/emitter/support.rb
 - lib/kapusta/compiler/lua_compat.rb
 - lib/kapusta/compiler/macro_expander.rb