dms-parser 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff6c29cfa7778eda9199a9b532ea2af36616977b1f4d839c39b7a6816e61b9c
-  data.tar.gz: '0049b496c4f68647eaf9078bdba8e165b67d049e51c194f9119142bc5e3e9769'
+  metadata.gz: 356dcaecf022100fac1eeae5350a76ecfc417f831f64084ffe912cd4da486a80
+  data.tar.gz: 74e4bd7721ac3f5c7325ada5145c98ad5eccb7723c6e0eed45fcd99dd0a61b9e
 SHA512:
-  metadata.gz: 5be4558f18b436cd0d5c943bc829b98547a724e5c10a214238f4fcadf24c4b24c3e3812b6b0f2b12912f08981e29c394d79d8208fa009151374271c473fa95f6
-  data.tar.gz: 491cab0c32eaa8d224ded077cafddd7f4d7fbefd4a50ce6a9e6000594058c40da8020798706e24ceb70ec0ad3fea982f7374dd45f471f4c88c9237ae1c8df15f
+  metadata.gz: 39ef8d91e5fdb82746a03ddc8e3b367970b60ff2291021b7a33ed922d3fc93a377f6e0a4c4ddd9093d52f9c7aae87bf3d674ca089bd18c6d6a42fcde2c58358a
+  data.tar.gz: d95fec6634f7049576d56e93195eb47f772e54daa49e270ea7afeace93c2ea3021747c9b8e4a8baa17e54779e1d687198f58462da5a7fd1531d6baf05f521cc8

data/lib/dms/tier1.rb

@@ -217,7 +217,7 @@ module Dms
     # params: Array of ParamGroup
     # params_dec: Array (always empty in this implementation)
     # sigil: String (the literal sigil string)
-    DecoratorCall = Struct.new(:sigil, :family, :fn_name, :ns, :position, :params, :params_dec)
+    DecoratorCall = Struct.new(:sigil, :family, :fn_name, :ns, :position, :params, :params_dec, :call_style)
 
     # kind: :named or :positional
     # value: Hash (for named) or Array (for positional)
@@ -463,7 +463,8 @@ module Dms
     # Resolve a decorator call's family from imports.
     # Returns [family_name, canonical_fn_name] or raises.
     # Also applies deny-list check.
-    def self.resolve_family(sigil, fn_name, ns, imports)
+    # call_style: :named or :nameless
+    def self.resolve_family(sigil, fn_name, ns, imports, call_style: :named)
       # Filter imports by ns if specified
       candidate_imports = if ns
                             filtered = imports.select { |imp| imp.ns == ns }
@@ -475,6 +476,24 @@ module Dms
                             imports
                           end
 
+      # Nameless call: fn_name is empty; resolve to the single bound family name
+      if call_style == :nameless
+        bound_families = []
+        candidate_imports.each do |imp|
+          (imp.bind[sigil] || []).each { |fam| bound_families << fam }
+        end
+        if bound_families.empty?
+          raise DecodeError.new(0, 0, "unbound sigil '#{sigil}'")
+        end
+        if bound_families.size > 1
+          raise DecodeError.new(0, 0,
+            "nameless call on sigil '#{sigil}' is ambiguous between families " \
+            + bound_families.map { |f| "'#{f}'" }.join(", "))
+        end
+        family = bound_families.first
+        return [family, family]
+      end
+
       # For each import, check families bound to this sigil
       # Apply aliases and allow/deny rules
       accepted = []  # [family_name, canonical_fn_name]
@@ -773,8 +792,8 @@ module Dms
       # But we don't know the next key yet — so we store them as pending.
       def collect_leading_decorators(path_prefix)
         while !eof? && sigil_at?(@pos)
-          sigil, fn_name, ns, params = parse_decorator_call
-          @pending_leading << { sigil: sigil, fn_name: fn_name, ns: ns, params: params }
+          sigil, fn_name, ns, params, cs = parse_decorator_call
+          @pending_leading << { sigil: sigil, fn_name: fn_name, ns: ns, params: params, call_style: cs }
           skip_trivia_no_consume_leading
           break if eof?
           # Check if next line also starts with a sigil
@@ -824,8 +843,8 @@ module Dms
           if sigil_at?(@pos)
             # Collect leading decorators for next value
             loop do
-              sigil, fn_name, ns, params = parse_decorator_call
-              @pending_leading << { sigil: sigil, fn_name: fn_name, ns: ns, params: params }
+              sigil, fn_name, ns, params, cs = parse_decorator_call
+              @pending_leading << { sigil: sigil, fn_name: fn_name, ns: ns, params: params, call_style: cs }
               # After decorator call, consume rest of line
               skip_inline_ws
               if consume_eol || eof?
@@ -860,8 +879,8 @@ module Dms
             pending = @pending_leading.dup
             @pending_leading.clear
             pending.each do |dec|
-              family, canonical_fn = resolve_call(dec[:sigil], dec[:fn_name], dec[:ns])
-              add_decorator_call(current_path, dec[:sigil], family, canonical_fn, dec[:ns], :leading, dec[:params])
+              family, canonical_fn = resolve_call(dec[:sigil], dec[:fn_name], dec[:ns], call_style: dec[:call_style] || :named)
+              add_decorator_call(current_path, dec[:sigil], family, canonical_fn, dec[:ns], :leading, dec[:params], call_style: dec[:call_style] || :named)
             end
           end
 
@@ -1029,9 +1048,9 @@ module Dms
       def parse_t1_inner_and_value(path)
         # Collect all consecutive inner decorator calls
         while !eof? && sigil_at?(@pos)
-          sigil, fn_name, ns, params = parse_decorator_call
-          family, canonical_fn = resolve_call(sigil, fn_name, ns)
-          add_decorator_call(path, sigil, family, canonical_fn, ns, :inner, params)
+          sigil, fn_name, ns, params, cs = parse_decorator_call
+          family, canonical_fn = resolve_call(sigil, fn_name, ns, call_style: cs || :named)
+          add_decorator_call(path, sigil, family, canonical_fn, ns, :inner, params, call_style: cs || :named)
           skip_inline_ws
         end
 
@@ -1059,9 +1078,9 @@ module Dms
 
       def parse_t1_trailing_decorators(path)
         while !eof? && sigil_at?(@pos)
-          sigil, fn_name, ns, params = parse_decorator_call
-          family, canonical_fn = resolve_call(sigil, fn_name, ns)
-          add_decorator_call(path, sigil, family, canonical_fn, ns, :trailing, params)
+          sigil, fn_name, ns, params, cs = parse_decorator_call
+          family, canonical_fn = resolve_call(sigil, fn_name, ns, call_style: cs || :named)
+          add_decorator_call(path, sigil, family, canonical_fn, ns, :trailing, params, call_style: cs || :named)
           skip_inline_ws
         end
       end
@@ -1081,15 +1100,28 @@ module Dms
 
         raise DecodeError.new(@line, col, "empty decorator sigil") if sigil.empty?
 
-        # Parse name (bare identifier)
-        # Could be: name  OR  ns.name
-        name1 = parse_bare_ident
-        raise DecodeError.new(@line, col, "expected decorator name after sigil '#{sigil}'") if name1.empty?
+        # Parse name (bare identifier) — may be empty for nameless calls
+        # Nameless: sigil followed by '(', whitespace, EOL, ',', ']', '}'
+        # Error: sigil followed by '.' (dotted form requires name before '.')
+        next_byte = @src.getbyte(@pos)
+        call_style = :named
+        if next_byte == DOT
+          raise DecodeError.new(@line, col, "dotted form requires a name before '.'")
+        elsif next_byte == LPAREN || next_byte == SP || next_byte == TAB ||
+              next_byte == LF || next_byte == CR || next_byte == COMMA ||
+              next_byte == RBRACK || next_byte == RBRACE || next_byte.nil? || @pos >= @src.bytesize
+          # Nameless call
+          call_style = :nameless
+          name1 = ""
+        else
+          name1 = parse_bare_ident
+          raise DecodeError.new(@line, col, "expected decorator name after sigil '#{sigil}'") if name1.empty?
+        end
 
         # Check for '.' => namespace qualifier
         ns = nil
         fn_name = name1
-        if @src.getbyte(@pos) == DOT
+        if call_style == :named && @src.getbyte(@pos) == DOT
           @pos += 1  # consume '.'
           name2 = parse_bare_ident
           if name2.empty?
@@ -1122,7 +1154,7 @@ module Dms
         # If no params at all, treat as one empty named group
         params << ParamGroup.new(:named, {}) if params.empty?
 
-        [sigil, fn_name, ns, params]
+        [sigil, fn_name, ns, params, call_style]
       end
 
       # Parse a param group (between parens, after '(' was consumed).
@@ -1244,9 +1276,9 @@ module Dms
             # Inner decorator in flow array
             loop do
               break unless sigil_at?(@pos)
-              sigil, fn_name, ns, params = parse_decorator_call
-              family, canonical_fn = resolve_call(sigil, fn_name, ns)
-              add_decorator_call(current_path, sigil, family, canonical_fn, ns, :inner, params)
+              sigil, fn_name, ns, params, cs = parse_decorator_call
+              family, canonical_fn = resolve_call(sigil, fn_name, ns, call_style: cs || :named)
+              add_decorator_call(current_path, sigil, family, canonical_fn, ns, :inner, params, call_style: cs || :named)
               skip_inline_ws
             end
             # Now parse the actual value
@@ -1326,20 +1358,20 @@ module Dms
         val
       end
 
-      def add_decorator_call(path, sigil, family, fn_name, ns, position, params)
+      def add_decorator_call(path, sigil, family, fn_name, ns, position, params, call_style: :named)
         path_key = path_to_key(path)
         entry = @dec_entries[path_key]
         if entry.nil?
           entry = DecoratorEntry.new(path.dup, {}, [])
           @dec_entries[path_key] = entry
         end
-        call = DecoratorCall.new(sigil, family, fn_name, ns, position, params, [])
+        call = DecoratorCall.new(sigil, family, fn_name, ns, position, params, [], call_style)
         entry.calls[sigil] ||= []
         entry.calls[sigil] << call
       end
 
-      def resolve_call(sigil, fn_name, ns)
-        Tier1.resolve_family(sigil, fn_name, ns, @imports)
+      def resolve_call(sigil, fn_name, ns, call_style: :named)
+        Tier1.resolve_family(sigil, fn_name, ns, @imports, call_style: call_style)
       end
 
       def path_to_key(path)
@@ -1732,7 +1764,8 @@ module Dms
         "ns"         => call.ns,
         "position"   => call.position.to_s,
         "params"     => params_json,
-        "params_dec" => []
+        "params_dec" => [],
+        "call_style" => (call.call_style || :named).to_s
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dms-parser
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Filip Lopes