Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add retractall/1 #155

Merged
merged 1 commit into from
Feb 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bootstrap.pl
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,12 @@
:- built_in(at_end_of_stream/0).
at_end_of_stream :- current_input(S), at_end_of_stream(S).

:- built_in(retractall/1).
retractall(Head) :-
retract((Head :- _)),
fail.
retractall(_).

%%%% non-ISO predicates

:- built_in(false/0).
Expand Down
3 changes: 2 additions & 1 deletion cmd/1pl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ func handleLine(ctx context.Context, buf *strings.Builder, p *prolog.Interpreter
}

if err := sols.Err(); err != nil {
return err
log.Print(err)
return nil
}

if !exists {
Expand Down
46 changes: 23 additions & 23 deletions engine/exception.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,74 +97,74 @@ func TypeError(validType Atom, culprit Term) *Exception {
Functor: "type_error",
Args: []Term{validType, culprit},
},
Atom(fmt.Sprintf("'%s' expected, found '%T'.", validType, culprit)),
Atom(fmt.Sprintf("Expected %s, found %T.", validType, culprit)),
},
},
}
}

func domainErrorFlagValue(culprit Term) *Exception {
return DomainError("flag_value", culprit, "%s is not a flag value.", culprit)
return DomainError("flag_value", culprit)
}

func domainErrorIOMode(culprit Term) *Exception {
return DomainError("io_mode", culprit, "%s is not an I/O mode.", culprit)
return DomainError("io_mode", culprit)
}

func domainErrorNotEmptyList(culprit Term) *Exception {
return DomainError("not_empty_list", culprit, "%s is an empty list.", culprit)
return DomainError("not_empty_list", culprit)
}

func domainErrorNotLessThanZero(culprit Term) *Exception {
return DomainError("not_less_than_zero", culprit, "%s is less than zero.", culprit)
return DomainError("not_less_than_zero", culprit)
}

func domainErrorOperatorPriority(culprit Term) *Exception {
return DomainError("operator_priority", culprit, "%s is not between 0 and 1200.", culprit)
return DomainError("operator_priority", culprit)
}

func domainErrorOperatorSpecifier(culprit Term) *Exception {
return DomainError("operator_specifier", culprit, "%s is neither xf, yf, xfx, xfy, yfx, fx, nor fy.", culprit)
return DomainError("operator_specifier", culprit)
}

func domainErrorPrologFlag(culprit Term) *Exception {
return DomainError("prolog_flag", culprit, "%s is not a prolog flag.", culprit)
return DomainError("prolog_flag", culprit)
}

func domainErrorReadOption(culprit Term) *Exception {
return DomainError("read_option", culprit, "%s is not a read option.", culprit)
return DomainError("read_option", culprit)
}

func domainErrorSourceSink(culprit Term) *Exception {
return DomainError("source_sink", culprit, "%s is not a source/sink.", culprit)
return DomainError("source_sink", culprit)
}

func domainErrorStream(culprit Term) *Exception {
return DomainError("stream", culprit, "%s is not a stream.", culprit)
return DomainError("stream", culprit)
}

func domainErrorStreamOption(culprit Term) *Exception {
return DomainError("stream_option", culprit, "%s is not a stream option.", culprit)
return DomainError("stream_option", culprit)
}

func domainErrorStreamOrAlias(culprit Term) *Exception {
return DomainError("stream_or_alias", culprit, "%s is neither a stream nor an alias.", culprit)
return DomainError("stream_or_alias", culprit)
}

func domainErrorStreamProperty(culprit Term) *Exception {
return DomainError("stream_property", culprit, "%s is not a stream property.", culprit)
return DomainError("stream_property", culprit)
}

func domainErrorWriteOption(culprit Term) *Exception {
return DomainError("write_option", culprit, "%s is not a write option.", culprit)
return DomainError("write_option", culprit)
}

func domainErrorOrder(culprit Term) *Exception {
return DomainError("order", culprit, "%s is neither <, =, nor >.", culprit)
return DomainError("order", culprit)
}

// DomainError creates a new domain error exception.
func DomainError(validDomain Atom, culprit Term, format string, args ...interface{}) *Exception {
func DomainError(validDomain Atom, culprit Term) *Exception {
return &Exception{
Term: &Compound{
Functor: "error",
Expand All @@ -173,26 +173,26 @@ func DomainError(validDomain Atom, culprit Term, format string, args ...interfac
Functor: "domain_error",
Args: []Term{validDomain, culprit},
},
Atom(fmt.Sprintf(format, args...)),
Atom(fmt.Sprintf("Invalid value for %s.", validDomain)),
},
},
}
}

func existenceErrorProcedure(culprit Term) *Exception {
return ExistenceError("procedure", culprit, "procedure %s is not defined.", culprit)
return ExistenceError("procedure", culprit)
}

func existenceErrorSourceSink(culprit Term) *Exception {
return ExistenceError("source_sink", culprit, "file %s doesn't exist.", culprit)
return ExistenceError("source_sink", culprit)
}

func existenceErrorStream(culprit Term) *Exception {
return ExistenceError("stream", culprit, "stream %s doesn't exist.", culprit)
return ExistenceError("stream", culprit)
}

// ExistenceError creates a new existence error exception.
func ExistenceError(objectType Atom, culprit Term, format string, args ...interface{}) *Exception {
func ExistenceError(objectType Atom, culprit Term) *Exception {
return &Exception{
Term: &Compound{
Functor: "error",
Expand All @@ -201,7 +201,7 @@ func ExistenceError(objectType Atom, culprit Term, format string, args ...interf
Functor: "existence_error",
Args: []Term{objectType, culprit},
},
Atom(fmt.Sprintf(format, args...)),
Atom(fmt.Sprintf("Unknown %s.", objectType)),
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion engine/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ func piArgs(t Term, env *Env) (ProcedureIndicator, []Term, error) {
case *Compound:
return ProcedureIndicator{Name: f.Functor, Arity: Integer(len(f.Args))}, f.Args, nil
default:
return ProcedureIndicator{}, nil, typeErrorCallable(t)
return ProcedureIndicator{}, nil, typeErrorCallable(f)
}
}

Expand Down
2 changes: 1 addition & 1 deletion interpreter.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func (i *Interpreter) consultOne(file engine.Term, env *engine.Env) error {

return nil
}
return engine.DomainError("source_sink", file, "%s does not exist.", file)
return engine.DomainError("source_sink", file)
default:
return engine.TypeError("atom", file)
}
Expand Down