Commit Graph

23 Commits

Author SHA1 Message Date
Simon Forman 2a66e7fb47 If I comment out the WTF handler...
...then the branch combinator works as intended.  (Although the constraint-based stuff was also cool, it would have captured information from the comparison.)


?- joy(`[32 >] [++] [--] ifte`, Si, So).
Si = [_6598|_6600],
So = [_6598+1|_6600] ;
Si = [_6598|_6600],
So = [_6598-1|_6600] ;
false.

?- sjc(hmm, `[32 >] [++] [--] ifte`).
func(hmm, [A|B], [A+1|B]).
true ;
func(hmm, [A|B], [A-1|B]).
true ;
false.
2019-07-20 16:57:19 -07:00
Simon Forman 714bf2cab6 Try to handle expressions in branch combinator.
If the expression isn't 'true' or 'false' atoms then we assume it's a comparison expression and try to check its truth value.

If this fails then it will try both branches, to allow for e.g. compilation.  THis almost works, but there's a choice point or something that gets hit before it tries the false path,

?- joy(` [32 >] [++] [--] ifte`, Si, So).
Si = [_2076|_2078],
So = [_2076+1|_2078] ;
wtf? +
Si = [_2076|_2078],
So = [[+], 1, _2076|_2078] ;
Si = [_2076|_2078],
So = [_2076-1|_2078] ;
wtf? -
Si = [_2076|_2078],
So = [[-], 1, _2076|_2078] ;
wtf? branch
Si = [_2076|_2078],
So = [[branch], [++], [--], _2076>32, _2076|_2078] ;
wtf? swap
Si = [_2076|_2078],
So = [[swap, branch], [--], [++], _2076>32, _2076|_2078] ;
wtf? first
Si = [_2076|_2078],
So = [[first, [++], [--], swap, branch], [_2076>32|_2078], _2076|_2078]


etc...
2019-07-20 16:45:28 -07:00
Simon Forman c676dce2f9 Handle exceptions in comparison ops.
You can't compare logic vars, so just bunt.
2019-07-20 16:38:48 -07:00
Simon Forman 47ae7b2328 More readable genrec.
Explicit quoting is slightly more overhead but worth it I think to show what's going on more clearly.
2019-07-16 09:53:48 -07:00
Simon Forman efeaa7b8e1 A little helper function to see compiled expressions.
Example from ordered binary tree notebook:

    ?- sjc(tree_add_Ee, `pop swap rolldown rrest ccons`).
    func(tree_add_Ee, [_, [_, _|C], A, B|D], [[A, B|C]|D]).
    true .
2019-07-16 09:46:55 -07:00
Simon Forman 6d92b8801f Clear out CLP(FD) functions.
I like them but then you are constrained (pun intended) to only using integers.  I'll probably bring them back at some point, either as an alternate implementation or their own commands.
2019-07-16 08:59:24 -07:00
Simon Forman 731b49973c Opps! Here's the implementation of bool. 2019-07-16 08:42:45 -07:00
Simon Forman 06b81914eb Change comparison ops to not use CLP(FD). 2019-07-15 23:02:08 -07:00
Simon Forman 84584a949c Implement genrec combinator. 2019-07-15 20:55:41 -07:00
Simon Forman 9ebc64541a Move all definitions to defs.txt. 2019-07-15 16:11:49 -07:00
Simon Forman ee395e91f1 Retract previous definitions before asserting new ones. 2019-07-15 16:01:59 -07:00
Simon Forman 4fefc04da3 Load definitions from a file.
This paves the way to regularize the defs between Python and Prolog (and and future other) implementations.
2019-07-15 15:53:07 -07:00
Simon Forman 087c141c72 Parse joy definitions from text.
This way a definitions file can be shared between Python Joy and Prolog Joy.
2019-07-15 12:53:48 -07:00
Simon Forman 166355dccf New combinator infrst == infra first
Three uses means it's time for a refactor.
2019-07-15 12:28:01 -07:00
Simon Forman 4ea1a5527e nullary combinator as definition.
That eliminates all the recursive calls to thun/3 (outside of thun itself, which is tail recursive.)  That means that this Joy interpreter is now fully CPS.

All state is contained in the stack and expression, nothing is hidden in the Prolog "call stack".
2019-07-15 11:20:13 -07:00
Simon Forman d3313ce4a7 Infra as definition. 2019-07-14 23:02:10 -07:00
Simon Forman 9f1e75313b Reimplement app1 and app2 as definitions.
This eliminates three recursive calls to thun/3.
2019-07-14 22:48:18 -07:00
Simon Forman f227cf0a57 Got enough definitions, sort them. 2019-07-14 21:58:20 -07:00
Simon Forman a90568e208 Switch to symbolic math (from CLP(FD).)
A wee bit of error reporting of unknown terms.

New functions: pm plus-or-minus and neg negate; new combinator dupdip.
2019-07-14 21:14:50 -07:00
Simon Forman 67112de952 Bring in the (sort of) compiler. 2019-04-28 07:59:47 -07:00
Simon Forman 36fa5ee151 Very minor cleanup. 2019-04-26 22:13:45 -07:00
Simon Forman 58e46a9809 Treat defs in thun/3 relation.
Allow for "compilation" of new func/3 rules.

Add comment of crude grammar for Joy syntax.

Minor rearrangements.

show_joy_compile uses portray_clause/1.
2019-04-26 21:58:15 -07:00
Simon Forman e573d7a3dc The Prolog version of Joy. 2018-08-24 16:52:00 -07:00