Merge branch 'mthom:master' into patch-5

Author: rotu

Cargo.toml

@@ -24,7 +24,6 @@ hostname = ["dep:hostname"]
 tls = ["dep:native-tls"]
 http = ["dep:warp", "dep:reqwest"]
 crypto-full = []
-"rust-version-1.80" = []
 
 [build-dependencies]
 indexmap = "2.3.0"

src/lib/clpz.pl

@@ -5088,19 +5088,45 @@
         ;   nonvar(Z), nonvar(X) ->
             (   Z > 0 ->
                 (   X < 0 -> true
-                ;   X >= Z
+                ;   X >= Z,
+                    % due to X = Z+Y*_ and Y > Z
+                    (   X-Z > 0 ->
+                        X-Z > Z
+                    ;   true
+                    )
                 )
             ;   Z < 0 ->
                 (   X > 0 -> true
-                ;   X =< Z
+                ;   X =< Z,
+                    % due to X = Z+Y*_ and Y < Z
+                    (   X-Z < 0 ->
+                        X-Z < Z
+                    ;   true
+                    )
                 )
             ;   Z =:= 0 % Multiple solutions so do nothing special.
             ),
             (   { fd_get(Y, _, _, n(YU), _),
                   YU < X, X =< 0 } -> kill(MState), Z =:= X
             ;   { fd_get(Y, _, n(YL), _, _),
                   YL > X, X >= 0 } -> kill(MState), Z =:= X
-            ;   (   Z > 0 ->
+            ;   (   Z > 0, X < 0 ->
+                    { fd_get(Y, YD, YPs),
+                      YMin is Z+1,
+                      YMax is Z-X,
+                      domain_remove_smaller_than(YD, YMin, YD1),
+                      domain_remove_greater_than(YD1, YMax, YD2) },
+                    fd_put(Y, YD2, YPs)
+                    % queue_goal((Y #> Z, Y #=< Z-X))
+                ;   Z < 0, X > 0 ->
+                    { fd_get(Y, YD, YPs),
+                      YMax is Z-1,
+                      YMin is Z-X,
+                      domain_remove_greater_than(YD, YMax, YD1),
+                      domain_remove_smaller_than(YD1, YMin, YD2) },
+                    fd_put(Y, YD2, YPs)
+                    % queue_goal((Y #< Z, Y #>= Z-X))
+                ;   Z > 0 ->
                     { fd_get(Y, YD, YPs),
                       YMin is Z + 1,
                       domain_remove_smaller_than(YD, YMin, YD1) },
@@ -5112,7 +5138,16 @@
                       domain_remove_greater_than(YD, YMax, YD1) },
                     fd_put(Y, YD1, YPs)
                     % queue_goal(Y #< Z)
-                ;   true
+                ;   Z =:= 0,
+                    (   X =:= 0 ->
+                        kill(MState) % trivial
+                    ;   % only 4 solutions {-abs(X),-1,1,abs(X)}
+                        { YL is -abs(X), YU is abs(X),
+                          fd_get(Y, YD0, YPs),
+                          domain_remove_smaller_than(YD0, YL, YD1),
+                          domain_remove_greater_than(YD1, YU, YD) },
+                        fd_put(Y, YD, YPs)
+                    )
                 )
             )
         ;   run_propagator(pmodz(X,Y,Z), MState),

src/lib/dcgs.pl

@@ -12,8 +12,8 @@
           [op(1105, xfy, '|'),
            phrase/2,
            phrase/3,
-           phrase/4,
-           phrase/5,
+           phrase//2,
+           phrase//3,
            seq//1,
            seqq//1,
            ... //0,
@@ -29,9 +29,9 @@
 
 :- meta_predicate phrase(2, ?, ?).
 
-:- meta_predicate phrase(2, ?, ?, ?).
+:- meta_predicate(phrase(3, ?, ?, ?)).
 
-:- meta_predicate phrase(2, ?, ?, ?, ?).
+:- meta_predicate(phrase(4, ?, ?, ?, ?)).
 
 :- meta_predicate(','(2, 2, ?, ?)).
 

src/lib/ops_and_meta_predicates.pl

@@ -26,7 +26,6 @@
 :- op(200, xfy, ^).
 :- op(500, yfx, /\).
 :- op(500, yfx, \/).
-:- op(500, yfx, xor).
 :- op(400, yfx, div).
 :- op(400, yfx, //).
 :- op(400, yfx, rdiv).

src/machine/mod.rs

@@ -118,32 +118,6 @@ fn current_dir() -> PathBuf {
     }
 }
 
-#[cfg(not(feature = "rust-version-1.80"))]
-mod libraries {
-    use indexmap::IndexMap;
-    use std::sync::OnceLock;
-
-    fn libraries() -> &'static IndexMap<&'static str, &'static str> {
-        static LIBRARIES: OnceLock<IndexMap<&'static str, &'static str>> = OnceLock::new();
-        LIBRARIES.get_or_init(|| {
-            let mut m = IndexMap::new();
-
-            include!(concat!(env!("OUT_DIR"), "/libraries.rs"));
-
-            m
-        })
-    }
-
-    pub(crate) fn contains(name: &str) -> bool {
-        libraries().contains_key(name)
-    }
-
-    pub(crate) fn get(name: &str) -> Option<&'static str> {
-        libraries().get(name).copied()
-    }
-}
-
-#[cfg(feature = "rust-version-1.80")]
 mod libraries {
     use indexmap::IndexMap;
     use std::sync::LazyLock;

src/machine/system_calls.rs

@@ -911,27 +911,16 @@ impl MachineState {
         use crate::parser::lexer::*;
 
         let nx = self.store(self.deref(self.registers[2]));
-        let add_dot = !string.ends_with('.');
-        let cursor = std::io::Cursor::new(string);
-
-        let iter = std::io::Read::chain(cursor, {
-            let mut dot_buf: [u8; '.'.len_utf8()] = [0u8];
-
-            if add_dot {
-                '.'.encode_utf8(&mut dot_buf);
-            }
-
-            std::io::Cursor::new(dot_buf)
-        });
+        let iter = std::io::Cursor::new(string);
 
         let mut lexer = Lexer::new(CharReader::new(iter), self);
         let mut tokens = vec![];
 
-        match lexer.next_token() {
+        match lexer.next_number_token() {
             Ok(token @ Token::Literal(Literal::Atom(atom!("-")) | Literal::Char('-'))) => {
                 tokens.push(token);
 
-                if let Ok(token) = lexer.next_token() {
+                if let Ok(token) = lexer.next_number_token() {
                     tokens.push(token);
                 }
             }
@@ -979,9 +968,6 @@ impl MachineState {
 
                     break;
                 }
-                Ok('.') => {
-                    lexer.skip_char('.');
-                }
                 Ok(c) => {
                     let (line_num, col_num) = (lexer.line_num, lexer.col_num);
 

src/parser/ast.rs

@@ -432,6 +432,7 @@ pub enum ParserError {
     BackQuotedString(usize, usize),
     IO(IOError),
     IncompleteReduction(usize, usize),
+    InfiniteFloat(usize, usize),
     InvalidSingleQuotedCharacter(char),
     LexicalError(lexical::Error),
     MissingQuote(usize, usize),
@@ -447,6 +448,7 @@ impl ParserError {
         match self {
             &ParserError::BackQuotedString(line_num, col_num)
             | &ParserError::IncompleteReduction(line_num, col_num)
+            | &ParserError::InfiniteFloat(line_num, col_num)
             | &ParserError::MissingQuote(line_num, col_num)
             | &ParserError::NonPrologChar(line_num, col_num)
             | &ParserError::ParseBigInt(line_num, col_num)
@@ -463,6 +465,9 @@ impl ParserError {
             ParserError::InvalidSingleQuotedCharacter(..) => {
                 atom!("invalid_single_quoted_character")
             }
+	    ParserError::InfiniteFloat(..) => {
+		atom!("infinite_float")
+	    }
             ParserError::IO(e) if e.kind() == ErrorKind::UnexpectedEof => {
                 atom!("unexpected_end_of_file")
             }