Remove '==' from definitions. (Bools)
I decided that the conceptual simplicity of omitting '==' is more useful than the cosmetic value of keeping it. The defs.txt file is now just one definition per line with the first symbol giving the name. Also, bools are literals.
This commit is contained in:
Simon Forman
parent
ed41395560
commit
e0a36eab8b
146
thun/defs.txt
146
thun/defs.txt
|
|
@ -1,73 +1,73 @@
|
|||
-- == 1 -
|
||||
? == dup bool
|
||||
++ == 1 +
|
||||
anamorphism == [pop []] swap [dip swons] genrec
|
||||
app1 == grba infrst
|
||||
app2 == [grba swap grba swap] dip [infrst] cons ii
|
||||
app3 == 3 appN
|
||||
appN == [grabN] cons dip map disenstacken
|
||||
at == drop first
|
||||
average == [sum 1.0 *] [size] cleave /
|
||||
b == [i] dip i
|
||||
binary == unary popd
|
||||
ccons == cons cons
|
||||
cleave == fork popdd
|
||||
clop == cleave popdd
|
||||
codireco == cons dip rest cons
|
||||
dinfrirst == dip infrst
|
||||
disenstacken == ? [uncons ?] loop pop
|
||||
down_to_zero == [0 >] [dup --] while
|
||||
drop == [rest] times
|
||||
dupd == [dup] dip
|
||||
dupdd == [dup] dipd
|
||||
dupdipd == dup dipd
|
||||
enstacken == stack [clear] dip
|
||||
flatten == [] swap [concat] step
|
||||
fork == [i] app2
|
||||
fourth == rest third
|
||||
gcd == true [tuck mod dup 0 >] loop pop
|
||||
grabN == [] swap [cons] times
|
||||
grba == [stack popd] dip
|
||||
hypot == [sqr] ii + sqrt
|
||||
ifte == [nullary] dipd swap branch
|
||||
ii == [dip] dupdip i
|
||||
infra == swons swaack [i] dip swaack
|
||||
infrst == infra first
|
||||
make_generator == [codireco] ccons
|
||||
neg == 0 swap -
|
||||
not == [true] [false] branch
|
||||
nullary == [stack] dinfrirst
|
||||
of == swap at
|
||||
pam == [i] map
|
||||
pm == [+] [-] clop
|
||||
popd == [pop] dip
|
||||
popdd == [pop] dipd
|
||||
popop == pop pop
|
||||
popopd == [popop] dip
|
||||
popopdd == [popop] dipd
|
||||
primrec == [i] genrec
|
||||
product == 1 swap [*] step
|
||||
quoted == [unit] dip
|
||||
range == [0 <=] [1 - dup] anamorphism
|
||||
range_to_zero == unit [down_to_zero] infra
|
||||
reverse == [] swap shunt
|
||||
rrest == rest rest
|
||||
run == [] swap infra
|
||||
second == rest first
|
||||
shift == uncons [swons] dip
|
||||
shunt == [swons] step
|
||||
size == 0 swap [pop ++] step
|
||||
split_at == [drop] [take] clop
|
||||
sqr == dup *
|
||||
step_zero == 0 roll> step
|
||||
sum == 0 swap [+] step
|
||||
swons == swap cons
|
||||
take == [] rolldown [shift] times pop
|
||||
ternary == binary popd
|
||||
third == rest second
|
||||
unary == nullary popd
|
||||
unit == [] cons
|
||||
unquoted == [i] dip
|
||||
unswons == uncons swap
|
||||
while == swap [nullary] cons dup dipd concat loop
|
||||
x == dup i
|
||||
-- 1 -
|
||||
? dup bool
|
||||
++ 1 +
|
||||
anamorphism [pop []] swap [dip swons] genrec
|
||||
app1 grba infrst
|
||||
app2 [grba swap grba swap] dip [infrst] cons ii
|
||||
app3 3 appN
|
||||
appN [grabN] cons dip map disenstacken
|
||||
at drop first
|
||||
average [sum 1.0 *] [size] cleave /
|
||||
b [i] dip i
|
||||
binary unary popd
|
||||
ccons cons cons
|
||||
cleave fork popdd
|
||||
clop cleave popdd
|
||||
codireco cons dip rest cons
|
||||
dinfrirst dip infrst
|
||||
disenstacken ? [uncons ?] loop pop
|
||||
down_to_zero [0 >] [dup --] while
|
||||
drop [rest] times
|
||||
dupd [dup] dip
|
||||
dupdd [dup] dipd
|
||||
dupdipd dup dipd
|
||||
enstacken stack [clear] dip
|
||||
flatten [] swap [concat] step
|
||||
fork [i] app2
|
||||
fourth rest third
|
||||
gcd true [tuck mod dup 0 >] loop pop
|
||||
grabN [] swap [cons] times
|
||||
grba [stack popd] dip
|
||||
hypot [sqr] ii + sqrt
|
||||
ifte [nullary] dipd swap branch
|
||||
ii [dip] dupdip i
|
||||
infra swons swaack [i] dip swaack
|
||||
infrst infra first
|
||||
make_generator [codireco] ccons
|
||||
neg 0 swap -
|
||||
not [true] [false] branch
|
||||
nullary [stack] dinfrirst
|
||||
of swap at
|
||||
pam [i] map
|
||||
pm [+] [-] clop
|
||||
popd [pop] dip
|
||||
popdd [pop] dipd
|
||||
popop pop pop
|
||||
popopd [popop] dip
|
||||
popopdd [popop] dipd
|
||||
primrec [i] genrec
|
||||
product 1 swap [*] step
|
||||
quoted [unit] dip
|
||||
range [0 <=] [1 - dup] anamorphism
|
||||
range_to_zero unit [down_to_zero] infra
|
||||
reverse [] swap shunt
|
||||
rrest rest rest
|
||||
run [] swap infra
|
||||
second rest first
|
||||
shift uncons [swons] dip
|
||||
shunt [swons] step
|
||||
size 0 swap [pop ++] step
|
||||
split_at [drop] [take] clop
|
||||
sqr dup *
|
||||
step_zero 0 roll> step
|
||||
sum 0 swap [+] step
|
||||
swons swap cons
|
||||
take [] rolldown [shift] times pop
|
||||
ternary binary popd
|
||||
third rest second
|
||||
unary nullary popd
|
||||
unit [] cons
|
||||
unquoted [i] dip
|
||||
unswons uncons swap
|
||||
while swap [nullary] cons dup dipd concat loop
|
||||
x dup i
|
||||
56
thun/thun.pl
56
thun/thun.pl
|
|
@ -35,14 +35,15 @@ joy(InputString, StackIn, StackOut) :-
|
|||
Parser
|
||||
|
||||
The grammar of Joy is very simple. A Joy expression is zero or more Joy
|
||||
terms separated by blanks and terms can be either integers, quoted Joy
|
||||
expressions, or symbols (names of functions.)
|
||||
terms separated by blanks and terms can be either integers, Booleans,
|
||||
quoted Joy expressions, or symbols (names of functions.)
|
||||
|
||||
joy ::= ( blanks term blanks )*
|
||||
|
||||
term ::= integer | '[' joy ']' | symbol
|
||||
term ::= integer | bool | '[' joy ']' | symbol
|
||||
|
||||
integer ::= [ '-' | '+' ] ('0'...'9')+
|
||||
bool ::= 'true' | 'false'
|
||||
symbol ::= char+
|
||||
|
||||
char ::= <Any non-space other than '[' and ']'.>
|
||||
|
|
@ -54,15 +55,8 @@ blank//0 matches and discards space and newline characters and integer//1
|
|||
into an integer." (https://www.swi-prolog.org/pldoc/man?section=basics)
|
||||
|
||||
Symbols can be made of any non-blank characters except '['and ']' which
|
||||
are fully reserved for list literals ("quotes"), and '==' is reserved as
|
||||
a kind of meta-logical punctuation for definitions (it's not a symbol,
|
||||
you can't use it in code, it only appears in the defs.txt file as a
|
||||
visual aid to humans. The rule of one definition per line with the
|
||||
name as the first symbol in the definition would suffice, but I tried it
|
||||
and it looked ugly to me. Any number of '=' characters can appear as
|
||||
part of a symbol, and any number of them other than two can be a symbol.)
|
||||
|
||||
Symbols 'true' and 'false' are treated as literals for Boolean values.
|
||||
are fully reserved for list literals (aka "quotes"). 'true' and 'false'
|
||||
would be valid symbols but they are reserved for Boolean literals.
|
||||
|
||||
For now strings are neglected in favor of lists of numbers. (But there's
|
||||
no support for parsing string notation and converting to lists of ints.)
|
||||
|
|
@ -73,8 +67,8 @@ square bracket but a little weird when it's a symbol term. E.g. "2[3]"
|
|||
parses as [2, [3]] but "23x" parses as [23, x]. It's a minor thing not
|
||||
worth disfiguring the grammar to change IMO.
|
||||
|
||||
Integers are converted to Prolog integers, symbols to Prolog atoms, and
|
||||
list literals to Prolog lists.
|
||||
Integers are converted to Prolog integers, symbols and bools to Prolog
|
||||
atoms, and list literals to Prolog lists.
|
||||
|
||||
*/
|
||||
|
||||
|
|
@ -87,7 +81,6 @@ joy_term(bool(true)) --> "true", !.
|
|||
joy_term(bool(false)) --> "false", !.
|
||||
joy_term(symbol(S)) --> symbol(S).
|
||||
|
||||
symbol(_) --> "==", !, {fail}. % prevents '==' parsing as [= =].
|
||||
symbol(C) --> chars(Chars), !, {atom_string(C, Chars)}.
|
||||
|
||||
chars([Ch|Rest]) --> char(Ch), chars(Rest).
|
||||
|
|
@ -105,6 +98,7 @@ thun([], S, S).
|
|||
thun([Term|E], Si, So) :- thun(Term, E, Si, So).
|
||||
|
||||
thun( int(I), E, Si, So) :- thun(E, [ int(I)|Si], So).
|
||||
thun(bool(B), E, Si, So) :- thun(E, [bool(B)|Si], So).
|
||||
thun(list(L), E, Si, So) :- thun(E, [list(L)|Si], So).
|
||||
thun(symbol(Def), E, Si, So) :- def(Def, Body), !, append(Body, E, Eo), thun(Eo, Si, So).
|
||||
thun(symbol(Func), E, Si, So) :- func(Func, Si, S), thun(E, S, So).
|
||||
|
|
@ -264,28 +258,30 @@ prepare_mapping( P, S, [T|In], Acc, Out) :-
|
|||
Definitions
|
||||
*/
|
||||
|
||||
joy_def(def(Def, Body)) --> symbol(Def), blanks, "==", joy_parse(Body).
|
||||
|
||||
joy_defs([Def|Rest]) --> blanks, joy_def(Def), blanks, joy_defs(Rest).
|
||||
joy_defs([]) --> [].
|
||||
joy_def --> joy_parse([symbol(Name)|Body]), { assert_def(Name, Body) }.
|
||||
|
||||
assert_defs(DefsFile) :-
|
||||
read_file_to_codes(DefsFile, Codes, []),
|
||||
phrase(joy_defs(Defs), Codes),
|
||||
maplist(assert_def, Defs).
|
||||
lines(Codes, Lines),
|
||||
maplist(phrase(joy_def), Lines).
|
||||
|
||||
assert_def(def(Def, Body)) :-
|
||||
( % Don't let Def "shadow" functions or combinators.
|
||||
\+ func(Def, _, _),
|
||||
\+ combo(Def, _, _, _, _)
|
||||
) -> (
|
||||
retractall(def(Def, _)),
|
||||
assertz(def(Def, Body))
|
||||
) ; true. % Otherwise it's okay.
|
||||
assert_def(Symbol, Body) :-
|
||||
( % Don't let this "shadow" functions or combinators.
|
||||
\+ func(Symbol, _, _),
|
||||
\+ combo(Symbol, _, _, _, _)
|
||||
) -> ( % Replace any existing defs of this name.
|
||||
retractall(def(Symbol, _)),
|
||||
assertz(def(Symbol, Body))
|
||||
) ; true.
|
||||
|
||||
% Split on newline chars a list of codes into a list of lists of codes
|
||||
% one per line. Helper function.
|
||||
lines([], []) :- !.
|
||||
lines(Codes, [Line|Lines]) :- append(Line, [0'\n|Rest], Codes), !, lines(Rest, Lines).
|
||||
lines(Codes, [Codes]).
|
||||
|
||||
:- assert_defs("defs.txt").
|
||||
|
||||
|
||||
words(Words) :-
|
||||
findall(Name, clause(func(Name, _, _), _), Funcs),
|
||||
findall(Name, clause(combo(Name, _, _, _, _), _), Combos, Funcs),
|
||||
|
|
|
|||
Loading…
Reference in New Issue