From: Mark Thom <markjordanthom@gmail.com>
Date: Tue, 14 Apr 2020 06:40:51 +0000 (-0600)
Subject: change from xsi to iso in bimetatrans, correct atomic/1 failure (#343)
X-Git-Tag: v0.8.123~166
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=16a572c250a9d0bb15f1069e1c4ff206b7233ee1;p=scryer-prolog.git

change from xsi to iso in bimetatrans, correct atomic/1 failure (#343)
---

diff --git a/src/prolog/examples/bimetatrans_ruleml.pl b/src/prolog/examples/bimetatrans_ruleml.pl
index 5ff1e207..d742d25b 100644
--- a/src/prolog/examples/bimetatrans_ruleml.pl
+++ b/src/prolog/examples/bimetatrans_ruleml.pl
@@ -790,7 +790,7 @@ constant_chars(symbol, Constant, Chars) :-
 
 /*
  * ruleml_data//1 delegates to ruleml_data_contents//2 to determine
- * the contents of <Data> nodes, with adjoining xsi:type elements.
+ * the contents of <Data> nodes, with adjoining iso:type elements.
  *
  * constant_chars/3 performs type-driven conversion between
  * Prolog/'$V' and RuleML/XML in both directions;
@@ -800,13 +800,13 @@ constant_chars(symbol, Constant, Chars) :-
 
 ruleml_data(Name) -->
     (  { var(Name) } ->
-       list_ws("<Data xsi:type=\""),
+       list_ws("<Data iso:type=\""),
        prolog_symbol(Type),
        list_ws("\">"),
        ruleml_data_contents(Type, Cs),
        { constant_chars(Type, Name, Cs) },
        list_ws("</Data>")
-    ;  "<Data xsi:type=\"",
+    ;  "<Data iso:type=\"",
        { constant_chars(Type, Name, Cs) },
        prolog_symbol(Type),
        "\">",
diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs
index 52d4e757..941fa4cb 100644
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -2400,7 +2400,13 @@ impl MachineState {
                 let d = self.store(self.deref(self[r1]));
 
                 match d {
-                    Addr::Con(_) => self.p += 1,
+                    Addr::Char(_) |
+                    Addr::CharCode(_) |
+                    Addr::Con(_) |
+                    Addr::EmptyList |
+                    Addr::Fixnum(_) |
+                    Addr::Float(_) |
+                    Addr::Usize(_) => self.p += 1,
                     _ => self.fail = true,
                 };
             }