upl 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f3986baaa4caf8654ae53619fc3606dd9f608f7f7722cd3860d6ec2af8a1fe
-  data.tar.gz: 18e8d59804dd3802da05df95d667ffff47d71e73af82d3bbad509dc0ab4f2930
+  metadata.gz: f95134fc8f05dbcae1453985815292af7af307cb7a9ab80fc767a45cdb8e06e2
+  data.tar.gz: fd6ce992bdd55c20998c470b187d0ad4c5ce87fe4ae358fe38c37a0bf6a935ad
 SHA512:
-  metadata.gz: f34cf6fafe347a3f7494108bf286abbff5771e51450594858d455d13630ac7645f36f1b26c3f45757a611bdca52dbe604dbd5e4c63c54ee4cb3cf176d22de7a8
-  data.tar.gz: c4524355fa328c53fe99c56a1a99553e0a9cecff4b31c177571f4c6b895bc229388829d406a714e34b61667f975b046dde2507236c473d565f415634a130f604
+  metadata.gz: ca68fb686b4b57d4c0a135fe9885b2b8c88cdfcababd0b9a80965f46e5199afa0f6c24d903747be9a2cc6cc904e767df869d3ee193087282849afa21634523f9
+  data.tar.gz: 99e4b8e2b6d908d5c03bcf2a2f2ccb7777accfe94a092ef43b3a7b9638efb529ac483f1f71a227da3528ac1ae0732319c291f98d3aa39d92877cd34f827a1fd8

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.3
+* update C value for >=swi-prolog-8.1.29
+
 == 0.2.2
 * restrict to <=swi-prolog-8.1.22
 

data/lib/upl/extern.rb

@@ -35,9 +35,8 @@ 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}"
+    if (version = swipl_config_values['PLVERSION']) < '80129'
+      raise "unsupported version <#{version}"
     end
 
     dlload so_path
@@ -105,30 +104,31 @@ module Upl
     PL_VARIABLE =              (1)
     PL_ATOM =                  (2)
     PL_INTEGER =               (3)
-    PL_FLOAT =                 (4)
-    PL_STRING =                (5)
-    PL_TERM =                  (6)
-    PL_NIL =                   (7)
-    PL_BLOB =                  (8)
-    PL_LIST_PAIR =             (9)
-    PL_FUNCTOR =               (10)
-    PL_LIST =                  (11)
-    PL_CHARS =                 (12)
-    PL_POINTER =               (13)
-    PL_CODE_LIST =             (14)
-    PL_CHAR_LIST =             (15)
-    PL_BOOL =                  (16)
-    PL_FUNCTOR_CHARS =         (17)
-    _PL_PREDICATE_INDICATOR =  (18)
-    PL_SHORT =                 (19)
-    PL_INT =                   (20)
-    PL_LONG =                  (21)
-    PL_DOUBLE =                (22)
-    PL_NCHARS =                (23)
-    PL_UTF8_CHARS =            (24)
-    PL_UTF8_STRING =           (25)
-    PL_INT64 =                 (26)
-    PL_NUTF8_CHARS =           (27)
+    PL_RATIONAL =              (4)
+    PL_FLOAT =                 (5)
+    PL_STRING =                (6)
+    PL_TERM =                  (7)
+    PL_NIL =                   (8)
+    PL_BLOB =                  (9)
+    PL_LIST_PAIR =             (10)
+    PL_FUNCTOR =               (11)
+    PL_LIST =                  (12)
+    PL_CHARS =                 (13)
+    PL_POINTER =               (14)
+    PL_CODE_LIST =             (15)
+    PL_CHAR_LIST =             (16)
+    PL_BOOL =                  (17)
+    PL_FUNCTOR_CHARS =         (18)
+    PL_PREDICATE_INDICATOR =   (19)
+    PL_SHORT =                 (20)
+    PL_INT =                   (21)
+    PL_LONG =                  (22)
+    PL_DOUBLE =                (23)
+    PL_NCHARS =                (24)
+    PL_UTF8_CHARS =            (25)
+    PL_UTF8_STRING =           (26)
+    PL_INT64 =                 (27)
+    PL_NUTF8_CHARS =           (28)
     PL_NUTF8_CODES =           (29)
     PL_NUTF8_STRING =          (30)
     PL_NWCHARS =               (31)
@@ -159,27 +159,34 @@ module Upl
 
     # /usr/lib64/swipl/include/SWI-Prolog.h
     module Convert
-      BUF_DISCARDABLE = 0x0000
-      BUF_RING =        0x0100
-      BUF_MALLOC =      0x0200
-      BUF_ALLOW_STACK = 0x0400
-
-      REP_ISO_LATIN_1 = 0x0000
-      REP_UTF8  =       0x1000
-      REP_MB =          0x2000
-
-      CVT_ATOM =            0x0001
-      CVT_STRING =          0x0002
-      CVT_LIST =            0x0004
-      CVT_INTEGER =         0x0008
-      CVT_FLOAT =           0x0010
-      CVT_VARIABLE =        0x0020
-      CVT_NUMBER =          CVT_INTEGER|CVT_FLOAT
-      CVT_ATOMIC =          CVT_NUMBER|CVT_ATOM|CVT_STRING
-      CVT_WRITE =           0x0040
-      CVT_WRITE_CANONICAL = 0x0080
-      CVT_WRITEQ =          0x00C0
-      CVT_ALL =             CVT_ATOMIC|CVT_LIST
+      BUF_DISCARDABLE =     0x00000000  # Store in single thread-local buffer
+      BUF_RING =            0x00010000  # Store in ring of 16 buffers
+      BUF_MALLOC =          0x00020000  # Store using PL_malloc()
+      BUF_ALLOW_STACK =     0x00040000  # Allow pointer into (global) stack
+      BUF_NORING =          0x00080000  # Do not store in ring
+
+      # output representation
+      REP_ISO_LATIN_1 =     0x00000000
+      REP_UTF8 =            0x00100000
+      REP_MB =              0x00200000
+
+      CVT_ATOM =            0x00000001
+      CVT_STRING =          0x00000002
+      CVT_LIST =            0x00000004
+      CVT_INTEGER =         0x00000008
+      CVT_RATIONAL =        0x00000010
+      CVT_FLOAT =           0x00000020
+      CVT_VARIABLE =        0x00000040
+      CVT_NUMBER =          (CVT_RATIONAL|CVT_FLOAT)
+      CVT_ATOMIC =          (CVT_NUMBER|CVT_ATOM|CVT_STRING)
+      CVT_WRITE =           0x00000080
+      CVT_WRITE_CANONICAL = 0x00000080
+      CVT_WRITEQ =          0x000000C0
+      CVT_ALL =             (CVT_ATOMIC|CVT_LIST)
+      CVT_MASK =            0x00000fff
+
+      CVT_EXCEPTION =       0x00001000  # throw exception on error
+      CVT_VARNOFAIL =       0x00002000  # return 2 if argument is unbound
     end
 
     extern 'predicate_t PL_pred(functor_t f, module_t m)'

data/lib/upl/tree.rb

@@ -53,6 +53,9 @@ module Upl
         bytes = double_ptr[0,8]
         bytes.unpack('D').first
 
+      when Extern::PL_RATIONAL
+        raise NotImplemented, 'convert to rational'
+
       when Extern::PL_STRING
         # TODO could possibly get away with BUF_DISCARDABLE here?
 

data/lib/upl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - John Anderson