split up CompilationError::InconsistentEntry

diff --git a/src/machine/machine_errors.rs b/src/machine/machine_errors.rs
index 5860fb5d75a9bba60f344f2d4c1ea9def8c3b491..bc88e017c8f31d0edf31b0ea1aaee382a31a8a61 100644 (file)
--- a/src/machine/machine_errors.rs
+++ b/src/machine/machine_errors.rs
@@ -572,9 +572,10 @@ impl MachineState {
         }
 
         let location = err.line_and_col_num();
-        let stub = err.as_functor();
+        let len = self.heap.len();
+        let stub = err.as_functor(&mut self.heap);
 
-        let stub = functor!(atom!("syntax_error"), [str(self.heap.len(), 0)], [stub]);
+        let stub = functor!(atom!("syntax_error"), [str(len, 0)], [stub]);
 
         MachineError {
             stub,
@@ -690,7 +691,12 @@ pub enum CompilationError {
     ExpectedRel,
     InadmissibleFact,
     InadmissibleQueryTerm,
-    InconsistentEntry,
+    ExpectedDecl(Term),
+    InvalidDecl(Atom, usize /* arity */),
+    InvalidOpDeclName(Term),
+    InvalidOpDeclSpecTerm(Term),
+    InvalidOpDeclSpecValue(Atom),
+    InvalidOpDeclPrec(Term),
     InvalidMetaPredicateDecl,
     InvalidModuleDecl,
     InvalidModuleExport,
@@ -722,7 +728,7 @@ impl CompilationError {
         }
     }
 
-    pub(crate) fn as_functor(&self) -> MachineStub {
+    pub(crate) fn as_functor(&self, heap: &mut Heap) -> MachineStub {
         match self {
             CompilationError::Arithmetic(..) => {
                 functor!(atom!("arithmetic_error"))
@@ -744,8 +750,48 @@ impl CompilationError {
                 // TODO: type_error(callable, _).
                 functor!(atom!("inadmissible_query_term"))
             }
-            CompilationError::InconsistentEntry => {
-                functor!(atom!("inconsistent_entry"))
+            CompilationError::ExpectedDecl(_term) => {
+                functor!(atom!("not_a_declaration"))
+            }
+            CompilationError::InvalidDecl(name, arity) => {
+                let culprit = functor_stub(*name, *arity);
+                functor!(
+                    atom!("existence_error"),
+                    [atom(atom!("declaration")), str(heap.len() + 2, 0)],
+                    [culprit]
+                )
+            }
+            CompilationError::InvalidOpDeclName(_term) => {
+                functor!(
+                    atom!("invalid_op_decl"),
+                    [atom(atom!("name")), atom(atom!("expected_string_or_atom"))]
+                )
+            }
+            CompilationError::InvalidOpDeclSpecTerm(_term) => {
+                functor!(
+                    atom!("invalid_op_decl"),
+                    [
+                        atom(atom!("specification")),
+                        atom(atom!("expected_string_or_atom"))
+                    ]
+                )
+            }
+            CompilationError::InvalidOpDeclSpecValue(spec) => {
+                let functor = functor!(atom!("invalid_value"), [atom(spec)]);
+                functor!(
+                    atom!("invalid_op_decl"),
+                    [atom(atom!("specification")), str(heap.len() + 2, 0)],
+                    [functor]
+                )
+            }
+            CompilationError::InvalidOpDeclPrec(_term) => {
+                functor!(
+                    atom!("invalid_op_decl"),
+                    [
+                        atom(atom!("precedence")),
+                        atom(atom!("expected_integer_in_range_0_to_1200"))
+                    ]
+                )
             }
             CompilationError::InvalidMetaPredicateDecl => {
                 functor!(atom!("invalid_meta_predicate_decl"))

diff --git a/src/machine/preprocessor.rs b/src/machine/preprocessor.rs
index ded794dd624dc3a7de40153be0d23575ff8bb592..b4effba33eb351f6220959f841f87f7180c8c21c 100644 (file)
--- a/src/machine/preprocessor.rs
+++ b/src/machine/preprocessor.rs
@@ -16,30 +16,37 @@ pub(crate) fn to_op_decl(prec: u16, spec: OpDeclSpec, name: Atom) -> OpDecl {
 }
 
 pub(crate) fn to_op_decl_spec(spec: Atom) -> Result<OpDeclSpec, CompilationError> {
-    OpDeclSpec::try_from(spec).map_err(|_err| CompilationError::InconsistentEntry)
+    OpDeclSpec::try_from(spec).map_err(|_err| CompilationError::InvalidOpDeclSpecValue(spec))
 }
 
 fn setup_op_decl(mut terms: Vec<Term>, atom_tbl: &AtomTable) -> Result<OpDecl, CompilationError> {
     let name = match terms.pop().unwrap() {
         Term::Literal(_, Literal::Atom(name)) => name,
         Term::Literal(_, Literal::Char(c)) => AtomTable::build_with(atom_tbl, &c.to_string()),
-        _ => return Err(CompilationError::InconsistentEntry),
+        other => {
+            return Err(CompilationError::InvalidOpDeclName(other));
+        }
     };
 
     let spec = match terms.pop().unwrap() {
         Term::Literal(_, Literal::Atom(name)) => name,
-        Term::Literal(_, Literal::Char(c)) => AtomTable::build_with(atom_tbl, &c.to_string()),
-        _ => return Err(CompilationError::InconsistentEntry),
+        other => {
+            return Err(CompilationError::InvalidOpDeclSpecTerm(other));
+        }
     };
 
     let spec = to_op_decl_spec(spec)?;
 
     let prec = match terms.pop().unwrap() {
-        Term::Literal(_, Literal::Fixnum(bi)) => match u16::try_from(bi.get_num()) {
+        term @ Term::Literal(_, Literal::Fixnum(bi)) => match u16::try_from(bi.get_num()) {
             Ok(n) if n <= 1200 => n,
-            _ => return Err(CompilationError::InconsistentEntry),
+            _ => {
+                return Err(CompilationError::InvalidOpDeclPrec(term));
+            }
         },
-        _ => return Err(CompilationError::InconsistentEntry),
+        other => {
+            return Err(CompilationError::InvalidOpDeclPrec(other));
+        }
     };
 
     Ok(to_op_decl(prec, spec, name))
@@ -327,9 +334,9 @@ pub(super) fn setup_declaration<'a, LS: LoadState<'a>>(
                 let (module_name, name, meta_specs) = setup_meta_predicate(terms, loader)?;
                 Ok(Declaration::MetaPredicate(module_name, name, meta_specs))
             }
-            _ => Err(CompilationError::InconsistentEntry),
+            _ => Err(CompilationError::InvalidDecl(name, terms.len())),
         },
-        _ => Err(CompilationError::InconsistentEntry),
+        other => Err(CompilationError::ExpectedDecl(other)),
     }
 }
 

diff --git a/tests/scryer/cli/src_tests/declaration_errors.md b/tests/scryer/cli/src_tests/declaration_errors.md
index e2b7112305ad37a80358ab19346d5f0f4cea0011..684824270bac714cd69e3c35f288c83645d499a4 100644 (file)
--- a/tests/scryer/cli/src_tests/declaration_errors.md
+++ b/tests/scryer/cli/src_tests/declaration_errors.md
@@ -1,35 +1,35 @@
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl1.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(invalid_op_decl(specification,invalid_value(moin))),load/1).
 
 ```
 
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl2.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(invalid_op_decl(precedence,expected_integer_in_range_0_to_1200)),load/1).
 
 ```
 
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl3.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(invalid_op_decl(name,expected_string_or_atom)),load/1).
 
 ```
 
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl4.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(existence_error(declaration,op/4)),load/1).
 
 ```
 
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl5.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(existence_error(declaration,(;)/2)),load/1).
 
 ```
 
 ```trycmd
 $ scryer-prolog -f --no-add-history tests-pl/invalid_decl6.pl -g halt
-   error(syntax_error(inconsistent_entry),load/1).
+   error(syntax_error(not_a_declaration),load/1).
 
 ```
\ No newline at end of file