From: Mark Thom <markjordanthom@gmail.com>
Date: Sun, 12 Apr 2020 22:01:53 +0000 (-0600)
Subject: change wording of QueryCannotBePostedAsFact to QueryCannotBeDefinedAsFact, remove... 
X-Git-Tag: v0.8.119~4
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=7621155a890dc86ef1bf164561b99c646bc1656a;p=scryer-prolog.git

change wording of QueryCannotBePostedAsFact to QueryCannotBeDefinedAsFact, remove old commented code in read.rs
---

diff --git a/src/prolog/machine/machine_errors.rs b/src/prolog/machine/machine_errors.rs
index 85bde23d..f57c169a 100644
--- a/src/prolog/machine/machine_errors.rs
+++ b/src/prolog/machine/machine_errors.rs
@@ -358,12 +358,12 @@ impl MachineError {
             SessionError::ParserError(err) => {
                 Self::syntax_error(h, err)
             }
-            SessionError::QueryCannotBePostedAsGoal => {
+            SessionError::QueryCannotBeDefinedAsFact => {
                 Self::permission_error(
                     h,
                     Permission::Create,
                     "static_procedure",
-                    functor!("query_cannot_be_posted_as_goal")
+                    functor!("query_cannot_be_defined_as_fact")
                 )
             }
         }
@@ -707,7 +707,7 @@ pub enum SessionError {
     ModuleDoesNotContainExport(ClauseName, PredicateKey),
     NamelessEntry,
     OpIsInfixAndPostFix(ClauseName),
-    QueryCannotBePostedAsGoal,
+    QueryCannotBeDefinedAsFact,
     ParserError(ParserError),
 }
 
diff --git a/src/prolog/machine/toplevel.rs b/src/prolog/machine/toplevel.rs
index 717f173e..7cb56cc6 100644
--- a/src/prolog/machine/toplevel.rs
+++ b/src/prolog/machine/toplevel.rs
@@ -1290,7 +1290,7 @@ impl<'a> TopLevelBatchWorker<'a> {
                 TopLevel::Declaration(decl) =>
                     return Ok(Some(decl)),
                 TopLevel::Query(_) =>
-                    return Err(SessionError::QueryCannotBePostedAsGoal),
+                    return Err(SessionError::QueryCannotBeDefinedAsFact),
             }
         }
 
diff --git a/src/prolog/read.rs b/src/prolog/read.rs
index 4162aede..a04b13d1 100644
--- a/src/prolog/read.rs
+++ b/src/prolog/read.rs
@@ -167,38 +167,8 @@ impl<'a> TermWriter<'a> {
             &TermRef::Clause(..) => {
                 Addr::Str(h)
             }
-            &TermRef::PartialString(..) => {//_, _, ref pstr, tail) => {
+            &TermRef::PartialString(..) => {
                 Addr::PStrLocation(h, 0)
-                /*
-                match tail {
-                    Term::AnonVar => {
-                        let h = self.machine_st.heap.h();
-                        self.machine_st.heap.allocate_pstr(pstr);
-
-                        Addr::PStrLocation(h, 0)
-                    }
-                    Term::Constant(_, Constant::EmptyList) => {
-                        self.machine_st.heap.put_complete_string(pstr)
-                    }
-                    Term::Var(_, ref var) => {
-                        let h = self.machine_st.heap.h();
-
-                        self.machine_st.heap.allocate_pstr(pstr);
-                        let tail_h = self.machine_st.heap.h() - 1;
-
-                        if let Some(addr) = self.var_dict.get(var) {
-                            self.machine_st.heap[tail_h] = HeapCellValue::Addr(*addr);
-                        } else {
-                            self.var_dict.insert(var.clone(), Addr::HeapCell(tail_h));
-                        }
-
-                        Addr::PStrLocation(h, 0)
-                    }
-                    _ => {
-                        unreachable!()
-                    }
-                }
-                */
             }
         }
     }
diff --git a/src/prolog/write.rs b/src/prolog/write.rs
index 129d480c..9c2267ae 100644
--- a/src/prolog/write.rs
+++ b/src/prolog/write.rs
@@ -319,8 +319,8 @@ impl fmt::Display for SessionError {
             &SessionError::ParserError(ref e) => {
                 write!(f, "syntax_error({})", e.as_str())
             }
-            &SessionError::QueryCannotBePostedAsGoal => {
-                write!(f, "query forms cannot be posted as goals.")
+            &SessionError::QueryCannotBeDefinedAsFact => {
+                write!(f, "queries cannot be defined as facts.")
             }
         }
     }