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

remove VNs variable from loader.pl

Browse Source
This commit is contained in:
Mark Thom
2021-02-17 13:31:58 -07:00
parent f9b98f97b6
commit 7670b81633
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clause_types.rs
View File

@@ -597,10 +597,10 @@ impl SystemClauseType {
("$add_discontiguous_predicate", 4) => { ("$add_discontiguous_predicate", 4) => {
Some(SystemClauseType::REPL(REPLCodePtr::AddDiscontiguousPredicate)) Some(SystemClauseType::REPL(REPLCodePtr::AddDiscontiguousPredicate))
} }
("$add_goal_expansion_clause", 4) => { ("$add_goal_expansion_clause", 3) => {
Some(SystemClauseType::REPL(REPLCodePtr::AddGoalExpansionClause)) Some(SystemClauseType::REPL(REPLCodePtr::AddGoalExpansionClause))
} }
("$add_term_expansion_clause", 3) => { ("$add_term_expansion_clause", 2) => {
Some(SystemClauseType::REPL(REPLCodePtr::AddTermExpansionClause)) Some(SystemClauseType::REPL(REPLCodePtr::AddTermExpansionClause))
} }
("$atom_chars", 2) => Some(SystemClauseType::AtomChars), ("$atom_chars", 2) => Some(SystemClauseType::AtomChars),

52
src/loader.pl
View File

@@ -111,7 +111,7 @@ load(Stream) :-
load(_). load(_).
load_loop(Stream, Evacuable) :- load_loop(Stream, Evacuable) :-
read_term(Stream, Term, [variable_names(VNs), singletons(Singletons)]), read_term(Stream, Term, [singletons(Singletons)]),
( Term == end_of_file -> ( Term == end_of_file ->
close(Stream), close(Stream),
'$conclude_load'(Evacuable) '$conclude_load'(Evacuable)
@@ -122,8 +122,8 @@ load_loop(Stream, Evacuable) :-
( var(Terms) -> ( var(Terms) ->
instantiation_error(load/1) instantiation_error(load/1)
; Terms = [_|_] -> ; Terms = [_|_] ->
compile_dispatch_or_clause_on_list(Terms, Evacuable, VNs) compile_dispatch_or_clause_on_list(Terms, Evacuable)
; compile_dispatch_or_clause(Terms, Evacuable, VNs) ; compile_dispatch_or_clause(Terms, Evacuable)
), ),
load_loop(Stream, Evacuable) load_loop(Stream, Evacuable)
). ).
@@ -202,44 +202,44 @@ expand_terms_and_goals(Term, Terms) :-
). ).
compile_dispatch_or_clause_on_list([], Evacuable, VNs). compile_dispatch_or_clause_on_list([], Evacuable).
compile_dispatch_or_clause_on_list([Term | Terms], Evacuable, VNs) :- compile_dispatch_or_clause_on_list([Term | Terms], Evacuable) :-
compile_dispatch_or_clause(Term, Evacuable, VNs), compile_dispatch_or_clause(Term, Evacuable),
compile_dispatch_or_clause_on_list(Terms, Evacuable, VNs). compile_dispatch_or_clause_on_list(Terms, Evacuable).
compile_dispatch_or_clause(Term, Evacuable, VNs) :- compile_dispatch_or_clause(Term, Evacuable) :-
( var(Term) -> ( var(Term) ->
instantiation_error(load/1) instantiation_error(load/1)
; compile_dispatch(Term, Evacuable, VNs) -> ; compile_dispatch(Term, Evacuable) ->
true true
; compile_clause(Term, Evacuable) ; compile_clause(Term, Evacuable)
). ).
compile_dispatch((:- Declaration), Evacuable, _VNs) :- compile_dispatch((:- Declaration), Evacuable) :-
( var(Declaration) -> ( var(Declaration) ->
instantiation_error(load/1) instantiation_error(load/1)
; compile_declaration(Declaration, Evacuable) ; compile_declaration(Declaration, Evacuable)
). ).
compile_dispatch(term_expansion(Term, Terms), Evacuable, VNs) :- compile_dispatch(term_expansion(Term, Terms), Evacuable) :-
'$add_term_expansion_clause'(term_expansion(Term, Terms), Evacuable, VNs). '$add_term_expansion_clause'(term_expansion(Term, Terms), Evacuable).
compile_dispatch((term_expansion(Term, Terms) :- Body), Evacuable, VNs) :- compile_dispatch((term_expansion(Term, Terms) :- Body), Evacuable) :-
'$add_term_expansion_clause'((term_expansion(Term, Terms) :- Body), Evacuable, VNs). '$add_term_expansion_clause'((term_expansion(Term, Terms) :- Body), Evacuable).
compile_dispatch(user:term_expansion(Term, Terms), Evacuable, VNs) :- compile_dispatch(user:term_expansion(Term, Terms), Evacuable) :-
'$add_term_expansion_clause'(term_expansion(Term, Terms), Evacuable, VNs). '$add_term_expansion_clause'(term_expansion(Term, Terms), Evacuable).
compile_dispatch((user:term_expansion(Term, Terms) :- Body), Evacuable, VNs) :- compile_dispatch((user:term_expansion(Term, Terms) :- Body), Evacuable) :-
'$add_term_expansion_clause'((term_expansion(Term, Terms) :- Body), Evacuable, VNs). '$add_term_expansion_clause'((term_expansion(Term, Terms) :- Body), Evacuable).
compile_dispatch(goal_expansion(Term, Terms), Evacuable, VNs) :- compile_dispatch(goal_expansion(Term, Terms), Evacuable) :-
prolog_load_context(module, user), prolog_load_context(module, user),
'$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable, VNs). '$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable).
compile_dispatch((goal_expansion(Term, Terms) :- Body), Evacuable, VNs) :- compile_dispatch((goal_expansion(Term, Terms) :- Body), Evacuable) :-
prolog_load_context(module, user), prolog_load_context(module, user),
'$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). '$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable).
compile_dispatch(user:goal_expansion(Term, Terms), Evacuable, VNs) :- compile_dispatch(user:goal_expansion(Term, Terms), Evacuable) :-
'$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable, VNs). '$add_goal_expansion_clause'(user, goal_expansion(Term, Terms), Evacuable).
compile_dispatch((user:goal_expansion(Term, Terms) :- Body), Evacuable, VNs) :- compile_dispatch((user:goal_expansion(Term, Terms) :- Body), Evacuable) :-
'$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable, VNs). '$add_goal_expansion_clause'(user, (goal_expansion(Term, Terms) :- Body), Evacuable).
compile_declaration(use_module(Module), Evacuable) :- compile_declaration(use_module(Module), Evacuable) :-