Don't shadow funcs and combos.

This commit is contained in:
Simon Forman
2019-08-11 15:12:56 -07:00
parent adf0e96f84
commit 4d33f32674
2 changed files with 8 additions and 5 deletions
+8 -1
View File
@@ -6,9 +6,12 @@ do :- assert_defs(`defs.txt`), print_defs, halt.
joy_def(def(Def, Body)) --> symbol(Def), blanks, "==", joy_parse(Body).
joy_defs --> blanks, joy_def(Def), {assert_def(Def)}, blanks, joy_defs.
joy_def --> joy_def(Def), {ignore(assert_def(Def))}.
joy_defs --> blanks, joy_def, blanks, joy_defs.
joy_defs --> [].
assert_defs(DefsFile) :-
read_file_to_codes(DefsFile, Codes, []),
phrase(joy_defs, Codes).
@@ -42,3 +45,7 @@ print_defs :-
print_def(Stream, Def) :- write(Stream, Def), write(Stream, `.`), nl(Stream).
ignore(Goal) :- Goal, !.
ignore(_).