upl 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098024c977917fd375c9743595fbee2063227946d6c2df8110ca5a7d76dd7cca'
-  data.tar.gz: b3a4df0143e5847a303fbef5dbbdb0f639c5270cb577c1bff932b5e15ed52c2d
+  metadata.gz: a3f3986baaa4caf8654ae53619fc3606dd9f608f7f7722cd3860d6ec2af8a1fe
+  data.tar.gz: 18e8d59804dd3802da05df95d667ffff47d71e73af82d3bbad509dc0ab4f2930
 SHA512:
-  metadata.gz: 21f5784f9b8c8699c75728cff0f57bf66f6eec802d613fb5018d224d4376d57702b570a7eb1210218bfd828f954e283a265f3885474eb1cd4c1a8c9599270936
-  data.tar.gz: 25ad0f5cfa693432e3ceee531eefa7d8ebde8f587ae8d7b80eacc57fb68b7baab72c21491e45a27c98c886bd458193d1c71627b4c6a7c038c548d853a47393d5
+  metadata.gz: f34cf6fafe347a3f7494108bf286abbff5771e51450594858d455d13630ac7645f36f1b26c3f45757a611bdca52dbe604dbd5e4c63c54ee4cb3cf176d22de7a8
+  data.tar.gz: c4524355fa328c53fe99c56a1a99553e0a9cecff4b31c177571f4c6b895bc229388829d406a714e34b61667f975b046dde2507236c473d565f415634a130f604

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.2
+* restrict to <=swi-prolog-8.1.22
+
 == 0.2.1
 * Query map_blk for transforms
 * frames for Query reuse

data/lib/upl.rb

@@ -15,12 +15,11 @@ require_relative 'upl/foreign'
 require_relative 'upl/query'
 
 module Upl
-  # todo need .call and .consult at this level?
-
+  # You probably want to use Query.new instead of this.
   # an enumerator yielding hashes keyed by the variables, mapping to the term
   module_function def query string_or_term, vars = nil, &blk
     if string_or_term.is_a?(Term) && vars
-      Runtime.term_vars_query string_or_term, vars
+      Runtime.query string_or_term, vars
     else
       case string_or_term
       when Term
@@ -29,13 +28,19 @@ module Upl
         Runtime.query string_or_term
       when String
         term, vars = Runtime.term_vars string_or_term
-        Runtime.term_vars_query term, vars, &blk
+        Runtime.query term, vars, &blk
       else
         raise "dunno about #{string_or_term.inspect}"
       end
     end
   end
 
+  # For semidet predicates, ie that have only one result.
+  # You have to extract values using Upl::Variable#to_ruby.
+  module_function def call term
+    Runtime::call term
+  end
+
   module_function def consult filename
     p = Pathname filename
     Runtime::call %Q{["#{p.realpath.to_s}"]}

data/lib/upl/dict.rb

@@ -38,7 +38,7 @@ module Upl
       query_hash.delete :Dict
 
       # now we have a result set with K,V values
-      en = Upl::Runtime.term_vars_query query_term, query_hash
+      en = Upl::Runtime.query query_term, query_hash
 
       # map to a hash-y thing
       en.each_with_object Dict.new(tag: dict_tag(dict_term_t)) do |row,values|

data/lib/upl/extern.rb

@@ -9,11 +9,13 @@ module Upl
 
     # fetch config values from swipl executable
     def self.swipl_config_values
-      swipl_exe = 'swipl'
-      values = `#{swipl_exe} --dump-runtime-variables=sh`.each_line.with_object Hash.new do |line,ha|
-        # split by = and for rhs strip surrounding quotes and trailing ;
-        line =~ /^([^=]+)="([^"]*)";\s*$/
-        ha[$1] = $2.strip
+      @swipl_config_value ||= begin
+        swipl_exe = 'swipl'
+        values = `#{swipl_exe} --dump-runtime-variables=sh`.each_line.with_object Hash.new do |line,ha|
+          # split by = and for rhs strip surrounding quotes and trailing ;
+          line =~ /^([^=]+)="([^"]*)";\s*$/
+          ha[$1] = $2.strip
+        end
       end
     rescue Errno::ENOENT => ex
       puts "#{swipl_exe} not found on path #{ENV['PATH']}"
@@ -33,6 +35,11 @@ module Upl
       exit 1
     end
 
+    if (version = swipl_config_values['PLVERSION']) >= '80100'
+      # 801xx seems to have changed some calls. Not sure yet what they are.
+      raise "unsupported version #{version}"
+    end
+
     dlload so_path
 
     def self.ruby_free_fn

data/lib/upl/query.rb

@@ -40,7 +40,7 @@ module Upl
     end
 
     def call
-      @results ||= Upl::Runtime.term_vars_query @term, @vars
+      @results ||= Upl::Runtime.query @term, @vars
     end
 
     def each &blk

data/lib/upl/runtime.rb

@@ -72,10 +72,7 @@ module Upl
     end
 
     # once_only. Should probably be a singleton or something.
-    # TODO Nope, wrong. init is for the entire engine.
-    # PL_thread_attach_engine is for one-to-one threads,
-    # PL_create_engine is for engine pool
-    Thread::current[:upl] ||= init
+    @_upl_runtime ||= init
 
     def self.predicate name, arity, module_name = 0
       Extern.PL_predicate Ptr[name.to_s], arity, Fiddle::Pointer[module_name]
@@ -122,11 +119,12 @@ module Upl
 
     # just to make sure the query handle pointer is properly closed
     # TODO should be private, because args are gnarly
-    def self.open_query qterm, args, mod: nil, flags: nil, &blk
+    def self.open_query qterm, mod: nil, flags: nil, &blk
       # This will need a string for the module, eventually
       # module is NULL, flags is 0
       mod ||= Fiddle::NULL
       flags ||= flags=Extern::Flags::PL_Q_EXT_STATUS | Extern::Flags::PL_Q_CATCH_EXCEPTION
+      args = TermVector.new qterm.arity do |idx| qterm[idx] end
 
       query_id_p = Extern.PL_open_query mod, flags, qterm.to_predicate, args.terms
       query_id_p != 0 or raise 'no space on environment stack, see SWI-Prolog docs for PL_open_query'
@@ -150,93 +148,43 @@ module Upl
       end
     end
 
-    # do a query for the given term and vars, as parsed by term_vars
+    # Do a query for the given term and vars, as parsed by term_vars.
     # qvars_hash is a hash of :VariableName => Term(PL_VARIABLE)
-    # and each variable is already bound in term.
+    # and each variable is already bound in qterm.
     # TODO much duplication between this and .query below
-    def self.term_vars_query qterm, qvars_hash
+    def self.query qterm, qvars_hash = nil
       raise "not a term" unless Term === qterm
       return enum_for __method__,  qterm, qvars_hash unless block_given?
 
-      with_frame do |fid_t|
-        # populate input values from qterm
-        args = TermVector.new qterm.arity do |idx| qterm[idx] end
-        open_query qterm, args do |query_id_p|
-          loop do
-            case Extern.PL_next_solution query_id_p
-            when Extern::ExtStatus::FALSE
-              break
-
-            when Extern::ExtStatus::EXCEPTION
-              raise_prolog_or_ruby query_id_p
-
-            # when Extern::ExtStatus::TRUE
-            # when Extern::ExtStatus::LAST
-            else
-              hash = qvars_hash.each_with_object Hash.new do |(name_sym,var),ha|
-                # var will be invalidated by the next call to PL_next_solution,
-                # so we need to construct a ruby tree copy of the value term.
-                ha[name_sym] = var.to_ruby
-              end
-
-              yield hash
-            end
+      result_map =
+      if qvars_hash
+        lambda do
+          # construct map of given variable names to their values
+          qvars_hash.each_with_object Hash.new do |(name_sym,var),ha|
+            ha[name_sym] = var.to_ruby
           end
         end
+      else
+        # no variable names provided so just get the values
+        ->{ qterm.map{|term_t| Tree.of_term term_t} }
       end
-    end
-
-    def self.predicate name, arity
-      pred_p = Extern.PL_predicate Ptr[name.to_s], arity, Fiddle::NULL
-    end
-
-    # Simple query with predicate / arity
-    # Returns an array of arrays.
-    # TODO remove, not really used
-    def self.squery predicate_str, arity
-      return enum_for :squery, predicate_str, arity unless block_given?
-
-      # bit of a hack because open_query wants to call to_predicate
-      # and we have to construct that manually here because Upl::Term
-      # is slightly ill-suited.
-      qterm = Object.new
-      qterm.define_singleton_method :to_predicate do
-        p_functor = Extern::PL_new_functor predicate_str.to_sym.to_atom, arity
-        Extern::PL_pred p_functor, Fiddle::NULL
-      end
-
-      args = TermVector.new arity
-      open_query qterm, args do |query_id_p|
-        loop do
-          rv = Extern.PL_next_solution query_id_p
-          break if rv == 0
-          yield args.each_t.map{|term_t| Tree.of_term term_t}
-        end
-      end
-    end
-
-    # TODO much duplication between this and .term_vars_query
-    # Only used by the term branch of Upl.query
-    def self.query term
-      raise "not a Term" unless Term === term
-      return enum_for :query, term unless block_given?
 
-      answer_lst = TermVector.new term.arity do |idx| term[idx] end
-
-      open_query term, answer_lst do |query_id_p|
+      open_query qterm do |query_id_p|
         loop do
-          case Extern.PL_next_solution query_id_p
+          case (status = Extern.PL_next_solution query_id_p)
           when Extern::ExtStatus::FALSE
             break
 
           when Extern::ExtStatus::EXCEPTION
             raise_prolog_or_ruby query_id_p
 
-          # when Extern::ExtStatus::TRUE
-          # when Extern::ExtStatus::LAST
-          else
-            yield answer_lst.each_t.map{|term_t| Tree.of_term term_t}
+          when Extern::ExtStatus::TRUE, Extern::ExtStatus::LAST
+            # var will be invalidated by the next call to PL_next_solution,
+            # so we need to construct a ruby tree copy of the value term immediately.
+            yield result_map[]
 
+          else
+            raise "unknown PL_next_solution status #{status}"
           end
         end
       end

data/lib/upl/version.rb

@@ -1,3 +1,3 @@
 module Upl
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler