swipl 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b73265ef1ec10d4379f3dbe6e660b8543a81fa3b
+  data.tar.gz: b11794f6bec59886a3feda9d32fe9d045edd41ff
+SHA512:
+  metadata.gz: f547466be92fc88cf1cd0a60eeb8b4e16876f6c6140b783b9dc2385c34ab681becb237352bd0e868192ea1d72a6be3e54c8f7a08d1a513b5a8bb46c54b100247
+  data.tar.gz: e666f623c96acd290386859ee9214972432f0ec9ef4abcaf33fd1d4c8c97e42aee81dd9f72ed4f61aba00530aa56f0ba987ba0e6f6866d37da910765e6c9d1fd

data/lib/swipl.rb

@@ -6,11 +6,19 @@ require 'swipl/term'
 require "swipl/version"
 
 module SWIPL
+	PL_FALSE = 0
 	PL_TRUE = 1
-	PL_FALSE = 2
 	PL_FAIL = PL_FALSE
+
 	PL_Q_NORMAL = 2
 
+	PL_FA_VARARGS =  8
+	PL_FA_NONDETERMINISTIC = 4
+
+	PL_FIRST_CALL = 0
+	PL_PRUNED = 1
+	PL_REDO = 2
+
 	def self.verify( fact )
 		CFFI.init
 		PrologFrame.on do |frame|
@@ -40,4 +48,89 @@ module SWIPL
 			raise "Truth '#{fact}' failed"
 		end
 	end
+
+	def self.fallacy( fact )
+		if self.verify( fact )
+			raise "Fallacy '#{fact}' is true"
+		end
+	end
+
+	def self.deterministic( name, arity, &block )
+		@registered = {} unless @registered
+		raise "predicate by that name is already registered" if @registered[ name ]
+
+		trampoline = FFI::Function.new( :uint, [:ulong, :int, :pointer] ) do |arg_base, arity, control|
+			stage = CFFI.PL_foreign_control( control )
+
+			arguments = (0..(arity -1 )).map do |index|
+				Term.new( arg_base + index )
+			end
+
+			if block.call( arguments )
+				CFFI::PL_succeed()
+			else
+				PL_FALSE
+			end
+		end
+
+		name_ptr = FFI::MemoryPointer.from_string( name.to_s )
+		raise "Failed to register" unless CFFI.PL_register_foreign( name_ptr, arity, trampoline, PL_FA_VARARGS )
+	end
+
+	class ForeignControl
+		def initialize( state )
+			@state = state
+		end
+
+		def context; @context ; end
+		def context=( value ); @context = value ; end
+		def first_call?; @state == PL_FIRST_CALL; end
+		def pruning?; @state == PL_PRUNED; end
+		def redo?; @state == PL_REDO; end
+	end
+
+	class ForeignFrame
+	end
+
+	def self.nondet( name, arity, &handler )
+		@registered = {} unless @registered
+		raise "predicate by that name is already registered" if @registered[ name ]
+
+		trampoline = CFFI::predicate_proc do |arg_base, arity, control|
+			result = nil
+
+			arguments = (0..(arity -1 )).map do |index|
+				Term.new( arg_base + index )
+			end
+
+			stage = ForeignControl.new CFFI.PL_foreign_control( control )
+			stage.context = CFFI.PL_foreign_context_address( control ) unless stage.first_call?
+			frame = ForeignFrame.new
+			handler.call( stage , arguments, frame, control )
+		end
+		@registered[name] = trampoline
+
+		name_ptr = FFI::MemoryPointer.from_string( name.to_s )
+		raise "Failed to register" unless CFFI.PL_register_foreign( name_ptr, arity, trampoline, PL_FA_VARARGS | PL_FA_NONDETERMINISTIC )
+	end
+
+	#
+	#
+	def self.find_all( name, args = [], &solution_handler )
+		solution_handler = Proc.new { |s| s } unless solution_handler
+		solutions = []
+		SWIPL::PrologFrame.on do |frame|
+			predicate = SWIPL::Predicate.find( name, args.length )
+			query = predicate.query_normally_with( frame, args )
+			begin
+				query.each_solution do |solution|
+					solutions.push( solution_handler.call(solution) )
+				end
+			ensure
+				query.close
+			end
+		end
+		solutions
+	end
 end
+

data/lib/swipl/cffi.rb

@@ -3,6 +3,9 @@ require 'ffi'
 module SWIPL
 	module CFFI
 		extend FFI::Library
+		typedef :pointer, :foreign_t
+		typedef :pointer, :control_t
+		typedef :ulong, :term_t
 
 		def self.import_symbols
 			attach_function :PL_open_foreign_frame, [], :ulong
@@ -14,20 +17,35 @@ module SWIPL
 			attach_function :PL_call, [:ulong, :pointer], :int
 			attach_function :PL_chars_to_term, [:pointer, :ulong], :int
 			attach_function :PL_close_query, [:ulong], :void
+			attach_function :PL_foreign_control, [:control_t], :int
+			attach_function :PL_foreign_context_address, [:control_t], :pointer
+			attach_function :long_PL_foreign_context_address, :PL_foreign_context_address, [:control_t], :ulong
 			attach_function :PL_get_atom_chars, [:ulong, :pointer], :int
 			attach_function :PL_initialise, [:int, :pointer], :int
-			attach_function :PL_is_atom, [:ulong], :int
-			attach_function :PL_is_ground, [:ulong], :int
+			attach_function :PL_is_atom, [:term_t], :int
+			attach_function :PL_is_ground, [:term_t], :int
 			attach_function :PL_new_atom, [:pointer], :ulong
-			attach_function :PL_new_term_ref, [], :ulong
-			attach_function :PL_new_term_refs, [:int], :ulong
+			attach_function :PL_new_term_ref, [], :term_t
+			attach_function :PL_new_term_refs, [:int], :term_t
 			attach_function :PL_next_solution, [:ulong], :int
-			attach_function :PL_open_query, [:pointer, :int, :ulong, :ulong], :ulong
+			attach_function :PL_open_query, [:pointer, :int, :ulong, :term_t], :ulong
+			attach_function :PL_put_atom_chars, [ :term_t, :string], :int
+			attach_function :PL_put_string_chars, [ :term_t, :string], :void
 			attach_function :PL_predicate, [:pointer, :int, :pointer], :ulong
+			attach_function :PL_register_foreign, [:pointer, :int, :pointer, :int], :foreign_t
+			attach_function :_PL_retry_address, [ :pointer ], :foreign_t
+			attach_function :_PL_retry, [ :pointer ], :foreign_t
+			attach_function :PL_term_type, [:term_t], :int
 			attach_function :PL_thread_self, [], :int
-			attach_function :PL_unify, [ :ulong, :ulong ], :int
+			attach_function :PL_unify, [ :term_t, :term_t ], :int
+			attach_function :PL_unify_string_chars, [ :ulong, :string], :void
+			attach_function :PL_unify_atom_chars, [ :term_t, :string], :void
 		end
 
+		def self.PL_succeed; PL_TRUE; end
+		def self.PL_retry_address( what ); _PL_retry_address( what ).address; end
+		def self.PL_retry( ptr ); _PL_retry( ptr ).address; end
+
 		def self.load( libraries )
 			ffi_lib libraries
 			self.import_symbols
@@ -56,5 +74,9 @@ module SWIPL
 
 			@is_initialized = true
 		end
+		
+		def self.predicate_proc( &handler )
+			FFI::Function.new( :size_t, [:ulong, :int, :pointer], handler ) 
+		end
 	end
 end

data/lib/swipl/predicate.rb

@@ -30,7 +30,10 @@ module SWIPL
 				end
 			end
 
-			query_id = CFFI.PL_open_query( nil, PL_Q_NORMAL, @pred_id, params[0].id )
+			base_ref = params.length > 0 ? params[0].id : 0
+
+			query_id = CFFI.PL_open_query( nil, PL_Q_NORMAL, @pred_id, base_ref )
+			raise "Failed to allocate query #{query_id}" if query_id == 0
 			Query.new( query_id, params )
 		end
 	end

data/lib/swipl/prologframe.rb

@@ -43,6 +43,10 @@ module SWIPL
 			end
 		end
 
+		def ref
+			refs(1)[0]
+		end
+
 		def atom_from_string( string )
 			atom_ptr = FFI::MemoryPointer.from_string( string.to_s )
 			atom_term = CFFI.PL_new_term_ref

data/lib/swipl/query.rb

@@ -2,12 +2,13 @@
 module SWIPL
 	class Query
 		def initialize( qid, terms )
+			raise "query_id is nil" unless qid
 			@query_id = qid
 			@terms = terms
 		end
 
 		def next_solution?
-			CFFI.PL_next_solution( @query_id ) == PL_TRUE 
+			CFFI.PL_next_solution( @query_id ) == PL_TRUE
 		end
 
 		def each_solution
@@ -16,6 +17,10 @@ module SWIPL
 			end
 		end
 
+		def terms
+			@terms
+		end
+
 		def close
 			CFFI.PL_close_query( @query_id )
 		end

data/lib/swipl/term.rb

@@ -8,22 +8,69 @@ module SWIPL
 		def id; self.term_id; end
 		def term_id; @term_id; end
 
-		def unify_with( other_term )
-			CFFI.PL_unify( @term_id, other_term.term_id ) != PL_FAIL
+		def unify_with( other_term, control = nil )
+			result = CFFI.PL_unify( @term_id, other_term.term_id ) != PL_FAIL
+			control.failed if control and !result
+			result
+		end
+
+		def unify_string( string )
+			CFFI.PL_unify_string_chars( @term_id, string )
+		end
+
+		def unify_atom_chars( string )
+			CFFI.PL_unify_atom_chars( @term_id, string )
+		end
+
+		def put_string( string )
+			CFFI.PL_put_string_chars( @term_id, string )
+		end
+
+		def put_atom( string )
+			raise "Failed to put atom" if CFFI.PL_put_atom_chars( @term_id, string ) == PL_FALSE
 		end
 
 		def ground?
+			str_ptr = FFI::MemoryPointer.new( :pointer, 1 )
 			CFFI.PL_is_ground( @term_id ) == PL_TRUE
 		end
 
 		def atom?
-			CFFI.PL_is_atom( @term_id ) 
+			CFFI.PL_is_atom( @term_id ) == PL_TRUE 
+		end
+
+		PL_VARIABLE = 1
+		PL_ATOM = 2
+		PL_NIL = 7
+		PL_BLOB = 8
+		PL_STRING = 5
+		PL_INTEGER = 3
+
+		def term_type
+			type_id = CFFI.PL_term_type( @term_id )
+			case type_id
+				when PL_VARIABLE
+					:variable
+				when PL_ATOM
+					:atom
+				when PL_NIL
+					:nil
+				when PL_BLOB
+					:blob
+				when PL_STRING
+					:string
+				when PL_INTEGER
+					:integer
+				else
+					:unknown
+			end
 		end
 
 		def as_atom
+			raise "not na atom" unless atom?
 			str_ptr = FFI::MemoryPointer.new( :pointer, 1 )
 			if CFFI.PL_get_atom_chars( @term_id, str_ptr ) == PL_FALSE
-				raise "failed to get term #{@term_id} as an atom"
+				raise "failed to get term #{@term_id} as an atom (type: #{term_type})"
 			end
 			str_ptr.read_pointer.read_string
 		end
@@ -33,7 +80,7 @@ module SWIPL
 				if self.atom?
 					self.as_atom
 				else
-					"ground"
+					"ground (#{term_type})"
 				end
 			else
 				"variable"

data/lib/swipl/version.rb

@@ -1,3 +1,3 @@
 module SWIPL
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,74 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: swipl
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Mark Eschbach
 autorequire: 
 bindir: exe
 cert_chain: []
-
-date: 2016-02-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-02-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.11"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.9"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :runtime
-  version_requirements: *id004
-description: Interact with the SWI Prolog system in ruby.  Currently uses FFI to bind using the C interface.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+description: Interact with the SWI Prolog system in ruby.  Currently uses FFI to bind
+  using the C interface.
+email:
 - meschbach@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,31 +91,27 @@ files:
 - lib/swipl/version.rb
 - swipl.gemspec
 homepage: https://github.com/meschbach/gem-swipl
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for SWI Prolog
 test_files: []
-