rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch invalid term from type to domain error

Browse Source
This commit is contained in:
Bennet Bleßmann
2024-08-04 15:16:37 +02:00
parent deed6fb984
commit 058b9c5e51
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/machine_errors.rs
View File

@@ -38,7 +38,6 @@ pub(crate) enum ValidType {
Callable, Callable,
Character, Character,
Compound, Compound,
Directive,
Evaluable, Evaluable,
Float, Float,
InByte, InByte,
@@ -74,7 +73,6 @@ impl ValidType {
// ValidType::PredicateIndicator => atom!("predicate_indicator"), // ValidType::PredicateIndicator => atom!("predicate_indicator"),
// ValidType::Variable => atom!("variable") // ValidType::Variable => atom!("variable")
ValidType::TcpListener => atom!("tcp_listener"), ValidType::TcpListener => atom!("tcp_listener"),
ValidType::Directive => atom!("directive"),
} }
} }
} }

4
src/machine/machine_state.rs
View File

@@ -981,8 +981,8 @@ impl MachineState {
pub(crate) fn directive_error(&mut self, err: DirectiveError) -> MachineError { pub(crate) fn directive_error(&mut self, err: DirectiveError) -> MachineError {
match err { match err {
DirectiveError::ExpectedDirective(_term) => self.type_error( DirectiveError::ExpectedDirective(_term) => self.domain_error(
ValidType::Directive, DomainErrorType::Directive,
atom_as_cell!(atom!("todo_insert_invalid_term_here")), atom_as_cell!(atom!("todo_insert_invalid_term_here")),
), ),
DirectiveError::InvalidDirective(name, arity) => { DirectiveError::InvalidDirective(name, arity) => {

2
tests/scryer/cli/src_tests/directive_errors.md
View File

@@ -30,7 +30,7 @@ $ scryer-prolog -f --no-add-history tests-pl/invalid_decl5.pl -g halt
```trycmd ```trycmd
$ scryer-prolog -f --no-add-history tests-pl/invalid_decl6.pl -g halt $ scryer-prolog -f --no-add-history tests-pl/invalid_decl6.pl -g halt
error(type_error(directive,todo_insert_invalid_term_here),load/1). error(domain_error(directive,todo_insert_invalid_term_here),load/1).
``` ```