jpt 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b81541e6476a9486b10d2442106aa6d61c6000b72535bc317806d0b3f93f47d
-  data.tar.gz: 675c96f768ce4f33cb4f2012683ad5afd4c21b28dd99bbf62dd027a4976060e1
+  metadata.gz: 2556dc372f83257488713fad1a473be979587873c8cb31d0f4833c736d286533
+  data.tar.gz: cff64906279a4fdff9e10be53807e29a074c9d0ae3890ebbc756b9fd5ee49d41
 SHA512:
-  metadata.gz: 5e5714c5e9d9fb9ec3e1961653978bba3477fa5c95601fbb949b153434ecd6820f020b54277237e8961a9321fd2a7a93db9ce42b7781ccfeccc4a6cca1355226
-  data.tar.gz: 1ba0a3379ebe75a2ae308da8676e94f3510d9ea044196aa2516b12f3f2b35eff783e4d7df40f1e0c29b2b6431093a58a8234f3caa857e18cec2667c3764ffb00
+  metadata.gz: 964781ffc90ec14022559b5128a0cecbb50ac4f6ae4ce1e1fd1a5b57031c663efc6557b65626b187916eb6ce9ad0be169bc5a2a155f8c97c9652de8cc5355342
+  data.tar.gz: c2e910750fb6180465cf673f33232f103e6d4dcf772351bafeb2c468c2579ba25a51bab15395dadf046e69003617e4842accdac33dd0fef72046bcabd239a00a

data/bin/jpt

@@ -10,6 +10,8 @@ Encoding.default_external = Encoding::UTF_8
 require 'optparse'
 require 'ostruct'
 
+FUNCSIG_CHARS = {"l" => :logical, "n" => :nodes, "v" => :value}
+
 $options = OpenStruct.new
 begin
   op = OptionParser.new do |opts|
@@ -21,6 +23,11 @@ begin
     opts.on("-l", "--[no-]lines", "multi-line mode") do |v|
       $options.lines = v
     end
+    opts.on("-fFUNCSIG", "--[no-]f=FUNCSIG", "add function signature name=rppp") do |v|
+      fail "funcsig format must be name=rppp" unless v =~ /\A([a-z][_a-z0-9]*)-([lnv]+)\z/
+      
+      JPTType.add_funcsig($1, $2)
+    end
     opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :jp], "Target format") do |v|
       $options.target = v
     end

data/jpt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "jpt"
-  s.version = "0.0.3"
+  s.version = "0.0.5"
   s.summary = "JSONPath tools"
   s.description = %q{jpt implements converters and miscellaneous tools for JSONPath}
   s.author = "Carsten Bormann"

data/lib/jpt.rb

@@ -1,6 +1,9 @@
 module JPTType
   # :value, :nodes, :logical
 
+
+  FUNCSIG_CHARS = {"l" => :logical, "n" => :nodes, "v" => :value}
+
   FUNCTABLE = {
     "length" => [:value, :value],
     "count" => [:value, :nodes],
@@ -8,6 +11,10 @@ module JPTType
     "search" => [:logical, :value, :value],
   }
 
+  def self.add_funcsig(name, sig)
+    FUNCTABLE[name] = sig.chars.map {FUNCSIG_CHARS[_1]}
+  end
+
   def declared_type(ast)
     case ast
     in Numeric | String | false | true | nil

data/lib/parser/jptgrammar.rb

@@ -3087,12 +3087,18 @@ module JPTGRAMMAR
   end
 
   module NameSegment1
+    def ast
+      elements[1].ast
+    end
+  end
+
+  module NameSegment2
     def member_name_shorthand
       elements[1]
     end
   end
 
-  module NameSegment2
+  module NameSegment3
     def ast
       elements[1].ast
     end
@@ -3136,6 +3142,7 @@ module JPTGRAMMAR
     if s1.last
       r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
       r1.extend(NameSegment0)
+      r1.extend(NameSegment1)
     else
       @index = i1
       r1 = nil
@@ -3159,8 +3166,8 @@ module JPTGRAMMAR
       end
       if s5.last
         r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-        r5.extend(NameSegment1)
         r5.extend(NameSegment2)
+        r5.extend(NameSegment3)
       else
         @index = i5
         r5 = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler