jpt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af31eebfdf3961e232c44fce1d5d43ee0c483ce3cf8406fb654a12a874286cba
-  data.tar.gz: 2bd781845060b59cd924edf1f84408f8c47e1c9d8373ae3a21296fce7ad2ee8b
+  metadata.gz: cbc6d1c075c3cc8c7cb51d81dc564daab584b89d802d11b169e2657efc1d4f2a
+  data.tar.gz: 59bc9814077744bbaee805fd5a9e2991c548708504a4fcb0571644b25bc97c05
 SHA512:
-  metadata.gz: 6f4d08616d657cb0f42e9bf90e251ec81792cc4568e3817cf58acb880f23d8558a355e2564383fb0e8d1f91b7d2cefdf5cfb63f3bf28662bc4d6def3e9a9d5ff
-  data.tar.gz: 6e994cde0c251ef44b70959d160ae4c541afc9b2f7ee12d520c0343bc9f95b0ca9058fd6249e9a0b2a9bc5b2b4ccf45cfbe27968ecd4921edc463d1eb061e0b2
+  metadata.gz: 1b99d81d4482db5157946c9c487a2c2194a905d03d5cf61658ba49e2c071af3fcde3185807e1cda9873175f5df2d7ca28dd04685fdddf178ec09acc9f1bb0856
+  data.tar.gz: 85623a3e0467b4f80844dc18d4da942ffe3c03f3ff180bfbad800f0457799b7e515770f301097dfb6f41fb2d5e5e9f8bbc48c020f9a45fabc0f6371ce2570e2a

data/bin/jpt

@@ -4,7 +4,7 @@ require 'yaml'
 require 'treetop'
 require 'json'
 
-require_relative '../lib/jpt.rb'
+require_relative '../lib/jpt'
  
 Encoding.default_external = Encoding::UTF_8
 require 'optparse'

data/jpt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "jpt"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = "JSONPath tools"
   s.description = %q{jpt implements converters and miscellaneous tools for JSONPath}
   s.author = "Carsten Bormann"
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'treetop', '~>1'
-  s.add_dependency 'json'
-  s.add_dependency 'neatjson'
+#  s.add_dependency 'json'
+  s.add_dependency 'neatjson', '~>0.10'
 end

data/lib/jpt.rb

@@ -1,7 +1,51 @@
+module JPTType
+  # :value, :nodes, :logical
+
+  FUNCTABLE = {
+    "length" => [:value, :value],
+    "count" => [:value, :nodes],
+    "match" => [:logical, :value, :value],
+    "search" => [:logical, :value, :value],
+  }
+
+  def declared_type(ast)
+    case ast
+    in Numeric | String | false | true | nil
+      :value
+    in ["@", *] | ["$", *]
+      :nodes
+    in ["func", funcname, *funcargs]
+      ret, *parms = FUNCTABLE[funcname]
+      if parms.length != funcargs.length
+        warn "*** Incorrect number of arguments #{ast} #{parms.inspect} #{funcargs.inspect}"
+      else
+        parms.zip(funcargs).each do |pm, ar|
+          declared_as(ar, pm, " in #{ast}") # XXX overhead
+        end
+      end
+      ret
+    end
+  end
+
+  def declared_as(ast, rt, s = "")
+    dt = declared_type(ast)
+    case [dt, rt]
+    in a, b if a == b
+      true
+    in [:nodes, :value] | [:nodes, :logical]
+      true
+    else
+      warn "*** Cannot use #{ast} with declared_type #{dt||:undefined} for required type #{rt}#{s}"
+      false
+    end
+  end
+end
+
 require_relative "parser/jpt-util.rb"
 
 class JPT
   @@parser = JPTGRAMMARParser.new
+  include ::JPTType
 
   DATA_DIR = Pathname.new(__FILE__) + "../../data/"
 

data/lib/parser/jpt-util.rb

@@ -1,18 +1,13 @@
 require 'treetop'
 require_relative './jptgrammar'
+require_relative '../jpt'
 
 class Treetop::Runtime::SyntaxNode
+  include ::JPTType
   def ast
     fail "undefined_ast #{inspect}"
   end
   def ast1                      # devhack
     "#{inspect[10..20]}--#{text_value[0..15]}"
   end
-  def repwrap(el, val)
-    if el.text_value == ''
-      val
-    else
-      ["rep", *el.ast, val]
-    end
-  end
 end

data/lib/parser/jptgrammar.rb

@@ -2309,10 +2309,14 @@ module JPTGRAMMAR
 
   module TestExpr2
     def ast
+      nest_ast = elements[1].ast
+      if nest_ast[0] == "func"
+        declared_as(nest_ast, :logical, " in test expression")
+      end
       if elements[0].text_value == ''
-        elements[1].ast
+        nest_ast
       else
-        ["not", elements[1].ast]
+        ["not", nest_ast]
       end
     end
   end
@@ -2646,7 +2650,11 @@ module JPTGRAMMAR
 
   module ComparisonExpr1
     def ast
-      [comparison_op.text_value, elements[0].ast, elements[4].ast]
+      sides = [elements[0].ast, elements[4].ast]
+      sides.each do |s|
+        declared_as(s, :value, " in comparable")
+      end
+      [comparison_op.text_value, *sides]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,48 +38,28 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: jpt implements converters and miscellaneous tools for JSONPath
 email: cabo@tzi.org
 executables:
-- cddlc~
-- jpc~
 - jpt
-- jpt~
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/cddlc~
-- bin/jpc~
 - bin/jpt
-- bin/jpt~
 - jpt.gemspec
 - lib/jpt.rb
 - lib/parser/jpt-util.rb

data/bin/cddlc~

@@ -1,131 +0,0 @@
-#!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'treetop'
-require 'json'
-
-require_relative '../lib/cddlc.rb'
-
-def named_keys(tree)
-  # warn [:T, tree].inspect
-  fail unless Array === tree
-  case tree[0]
-  when "seq", "gcho", "tcho"
-    tree[1..-1].flat_map {|x| named_keys(x)}
-  when "rep"
-    named_keys(tree[3])
-  when "mem"
-    key = tree[1]
-    if Array === key && key[0] == "name"
-      [key[1]]
-    end
-  end || []
-end
-
-def integer_value(tree)
-  tree and (
-    fail tree.inspect unless Array === tree
-    case tree[0]
-    when "number"
-      tree[1]
-      # XXX: could add other cases
-    end
-  )
-end
-
-def snaky(name)
-  name.gsub(/-/, "_")
-end
- 
-Encoding.default_external = Encoding::UTF_8
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-begin
-  op = OptionParser.new do |opts|
-    opts.banner = "Usage: cddlc.rb [options] file.cddl"
-
-    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      $options.verbose = v
-    end
-    opts.on("-r", "--[no-]rules", "Process rules") do |v|
-      $options.rules = v
-    end
-    opts.on("-x", "--[no-]expand", "Expand generics") do |v|
-      $options.expand_generics = v
-    end
-    opts.on("-u", "--[no-]undefined", "Note undefined names") do |v|
-      $options.note_undefined = v
-    end
-    opts.on("-2", "--[no-]cddl2", "Perform some CDDL 2.0 processing") do |v|
-      $options.cddl2 = v
-    end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :cddl], "Target format") do |v|
-      $options.target = v
-    end
-  end
-  op.parse!
-rescue Exception => e
-  warn e
-  exit 1
-end
-
-if ARGV == []
-  puts op
-  exit 1
-end
-cddl_file = ARGF.read
-
-cddl = CDDL.from_cddl(cddl_file)
-result = if $options.rules
-           if $options.expand_generics
-             require_relative "../lib/processor/cddl-expander.rb"
-             cddl.expand_generics
-           end
-           cddl.rules
-         else
-           warn "** can't expand in tree; use -r flag as well" if $options.expand_generics
-           cddl.tree
-         end
-
-warn "** can't note undefined for target != cddl" if $options.note_undefined && $options.target != :cddl
-
-case $options.target
-when :basic, nil
-  pp result
-when :neat, :json
-  require 'neatjson'
-  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-when :yaml
-  puts result.to_yaml
-when :enum
-  rules = cddl.rules
-  rules.each do |k, v|
-    if v[0] == "map"
-      nk = v[1..-1].flat_map {|e| named_keys(e)}
-      # warn [:NK, k, nk].inspect
-      nk = nk.map {|name| i = integer_value(rules[name]); [name, i] if i}.compact
-      # warn [:NK, k, nk].inspect
-      if nk != []
-        puts "enum #{snaky(k).downcase}_keys {"
-        nk.each do |n, v|
-          puts "  #{snaky(n).upcase} = #{v},"
-        end
-        puts "};"
-      end
-    end
-  end
-when :cddl
-  require_relative '../lib/writer/cddl-writer.rb'
-  if $options.note_undefined
-    require_relative '../lib/processor/cddl-undefined.rb'
-    undef_rule = cddl.cddl_undefined
-    undef_rule.each do |k|
-      puts ";;; *** undefined: #{k}"
-    end
-  end
-  puts cddl.to_s
-else
-  warn ["Unknown target format: ", $options.target].inspect
-end

data/bin/jpc~

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'treetop'
-require 'json'
-
-require_relative '../lib/jpc.rb'
- 
-Encoding.default_external = Encoding::UTF_8
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-begin
-  op = OptionParser.new do |opts|
-    opts.banner = "Usage: jpc.rb [options] file.jp"
-
-    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      $options.verbose = v
-    end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :jp], "Target format") do |v|
-      $options.target = v
-    end
-  end
-  op.parse!
-rescue Exception => e
-  warn e
-  exit 1
-end
-
-if ARGV == []
-  puts op
-  exit 1
-end
-jpc_file = ARGF.read
-
-jpc = JPC.from_jpc(jpc_file)
-result = jp.tree
-
-case $options.target
-when :basic, nil
-  pp result
-when :neat, :json
-  require 'neatjson'
-  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-when :yaml
-  puts result.to_yaml
-when :jp
-  require_relative '../lib/writer/jp-writer.rb'
-  puts jpc.to_s
-else
-  warn ["Unknown target format: ", $options.target].inspect
-end

data/bin/jpt~

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-require 'pp'
-require 'yaml'
-require 'treetop'
-require 'json'
-
-require_relative '../lib/jpt.rb'
- 
-Encoding.default_external = Encoding::UTF_8
-require 'optparse'
-require 'ostruct'
-
-$options = OpenStruct.new
-begin
-  op = OptionParser.new do |opts|
-    opts.banner = "Usage: jpt.rb [options] file.jp"
-
-    opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-      $options.verbose = v
-    end
-    opts.on("-tFMT", "--to=FMT", [:basic, :neat, :json, :yaml, :enum, :jp], "Target format") do |v|
-      $options.target = v
-    end
-  end
-  op.parse!
-rescue Exception => e
-  warn e
-  exit 1
-end
-
-if ARGV == []
-  puts op
-  exit 1
-end
-jp_file = ARGF.read
-
-jpt = JPT.from_jp(jp_file)
-result = jpt.tree
-
-case $options.target
-when :basic, nil
-  pp result
-when :neat, :json
-  require 'neatjson'
-  puts JSON.neat_generate(result, after_comma: 1, after_colon: 1)
-when :yaml
-  puts result.to_yaml
-when :jp
-  require_relative '../lib/writer/jp-writer.rb'
-  puts jpt.to_s
-else
-  warn ["Unknown target format: ", $options.target].inspect
-end