Commit Graph

124 Commits

Author SHA1 Message Date
Simon Forman dea6cbc8c2 Working to get types right. 2018-07-19 12:38:19 -07:00
Simon Forman 6576e1a431 Fix TextJoyType inheritance. 2018-07-18 17:47:19 -07:00
Simon Forman 49941f9a33 Log types at startup. 2018-07-18 17:06:51 -07:00
Simon Forman 1e8c196c5b Add some logging. 2018-07-18 16:14:32 -07:00
Simon Forman 3c27fab071 Cache the results of type checking. 2018-07-18 16:13:57 -07:00
Simon Forman 8ad4ab791b Removing polytypes; some pylint hints. 2018-07-18 14:55:39 -07:00
Simon Forman 7607ca7650 Definitions infer stack effects.
At start-up defs that DON'T type check are permitted (so you can use e.g.
loop, map, etc.) in the definitions "source", but then the user-facing
inscribe command only allows you to define new commands that DO
type-check.  The ideal solution here is to get inference working for the
loopy words.  (In the meantime you can select and execute their
definition text directly.  That's not (yet!) type-checked.)
2018-07-17 20:52:57 -07:00
Simon Forman c9f405fbe9 Nearly there maybe, maybe not. 2018-07-17 20:09:17 -07:00
Simon Forman 73d19b1f3d Moving right along.
A little clunky but it seems to work so far.
2018-07-17 17:12:27 -07:00
Simon Forman c2dd7cca0a So fra, so good... 2018-07-17 12:43:24 -07:00
Simon Forman 25b7871074 i got used to it, but Jupyter likes 4 2018-07-17 10:49:09 -07:00
Simon Forman 14d67dd7c5 in the middle, just want to 2ify my indents... 2018-07-17 10:47:50 -07:00
Simon Forman 0029656351 TextJoyType and inscribe command.
I took the plunge and added the meta-command "inscribe" to the library.
This is, of course, a very dangerous and powerful command.  Use it
wisely.
2018-07-17 10:35:11 -07:00
Simon Forman d9d52fa224 A few more stack effects. 2018-07-16 20:28:53 -07:00
Simon Forman 3551b6148b expectations_of_definition() and some helper infer funcs. 2018-07-16 19:10:16 -07:00
Simon Forman 043acd685c More stack effects, and modify the key bindings. 2018-07-16 18:43:40 -07:00
Simon Forman cf12b9ce17 Fix bugs
Type checking e.g. sum or product.
Any type accepts complex numbers.
Lots of the math functions now just use Number rather than more specific
poly-types.
2018-07-15 20:37:52 -07:00
Simon Forman c4af5682c4 That "fix" wasn't a fix.
It broke other stuff.  What I really wanted to do was change the stack
effect of 'clear'.
2018-07-15 14:06:10 -07:00
Simon Forman 20d87db9d5 Fix up stacks for type checking.
Sometimes (e.g. 'clear') the () at the end of the stack was tripping up
the unify() function.
2018-07-15 13:57:11 -07:00
Simon Forman e169c6aae2 Some integration with Type Checking.
Now the UI highlights commands and numbers as you move the mouse, numbers
are blue, commands that type-check are green, commands that fail to
type-check are orange and will not be interpreted, and if there is no
stack effect information available for a command it is grey but you can
still attempt to execute it.

You can still evaluate whole expressions by selceting them and
right-inter-clicking before you release the left button, or by putting
the cursor on a line and typing ctrl-enter, which will run the whole
line.  These expressions are NOT (yet) type-checked.
2018-07-15 11:48:08 -07:00
Simon Forman 0292e8a297 Much globals. Wow. 2018-07-14 20:58:43 -07:00
Simon Forman 7899d68bab Minor cleanup. 2018-07-14 20:55:34 -07:00
Simon Forman ebb731126d Move load_stack() to StackDisplayWorld. 2018-07-14 20:47:04 -07:00
Simon Forman da03f60dca Move StackDisplayWorld into world.py 2018-07-14 19:51:31 -07:00
Simon Forman ea11fbebda Move reset() to text method.
Rearrange some other stuff.
2018-07-14 19:34:01 -07:00
Simon Forman 8bbf4fc2bf Correct some typo
I accidentally pasted or something.
2018-07-14 19:14:01 -07:00
Simon Forman 6fe83256b1 Move init_text() to Text method. 2018-07-14 19:11:49 -07:00
Simon Forman a84966cf9b Split some code into a utils.py module. 2018-07-14 18:51:22 -07:00
Simon Forman 4fb9e1e003 Minor cleanup.
Improve the behavior of the World.
2018-07-14 18:41:36 -07:00
Simon Forman 9ea0157969 Partial harmonize key commands.
Fix bug cut instead of copy.
2018-07-14 18:25:12 -07:00
Simon Forman 862e0b07a8 It's time to bring in the GUI.
Minimalist (not to say Brutalist) UI based on text windows and mouse
chords.  Experimental.
2018-07-14 12:45:52 -07:00
Simon Forman fcf483af22 Ah, Symbols. 2018-07-11 07:12:14 -07:00
Simon Forman 343a2f8459 Unicode in docstring. 2018-07-11 07:11:56 -07:00
Simon Forman 0980d1b7c9 ifte as definition; "fork" combinator. 2018-07-11 07:10:54 -07:00
Simon Forman d95b92314e Clean up. 2018-07-06 14:20:04 -07:00
Simon Forman 1862ece03e Adding support for type checking. 2018-07-06 14:19:36 -07:00
Simon Forman 531e215ffd Another definition for while. 2018-07-06 14:19:00 -07:00
Simon Forman ab8ec6c95d Minor cleanup.
Renamed update() to reify() and reinstated recursive substitution.
2018-07-04 10:37:43 -07:00
Simon Forman 4fff827338 Extra logging and another lil test. 2018-06-30 23:20:00 -07:00
Simon Forman ab1f5227ba Hmm.
I think update() should be done better...
2018-06-30 12:59:14 -07:00
Simon Forman 4406a6620b Type inference of Joy expressions.
More remains to be done but it seems to work.
2018-06-29 13:19:12 -07:00
Simon Forman 6ca59847ab Gotta update() expression too.
If type vars get into the espression you have to keep them in sync with
the unification or you can lose information.


Some combinators can put symbols on the expression, you have to convert
those to type checkers or, as a hack, just look them up and run them.
This lets definitions work(-ish), ...
2018-06-27 22:26:27 -07:00
Simon Forman fc45727008 Minor cleanup. 2018-06-27 19:03:23 -07:00
Simon Forman 4321ea874b don't compose lits
It forces the identities of lits to change during relabel().

I think we still have to update() the expression to track changes in the
F function stack effect or we risk losing assoviations between type
variables in the stack effects and type variables in the pending
expression.  Hrmmm.
2018-06-26 22:39:06 -07:00
Simon Forman db28989b64 Trying to add a guard to combinators.
So they can notice if they're given a stack that doesn't match what
they're expecting.

This seems to work, but I realized that type variables in the pending
expression need to be update()'d too.  hmm...
2018-06-26 21:45:58 -07:00
Simon Forman eb739024eb Type checking, initial work. 2018-06-26 15:23:51 -07:00
Simon Forman 705c95ee28 Fix a couple of bug in Kleene Stars.
...and some minor cleanup.
2018-06-25 12:43:05 -07:00
Simon Forman f1979f35ce Some more tests.
Damn thing seems to be working.
2018-06-25 06:51:12 -07:00
Simon Forman baae1a5b36 Change name of kav() to infer(). 2018-06-24 18:48:22 -07:00
Simon Forman d874b2a134 Minor cleanup.
Joy type errors get their own exception class.
2018-06-24 18:39:46 -07:00
Simon Forman 1aace53fa0 Infencer/Interpreter hybrid and Kleene Star types.
Still draft but it works.  Gotta clean it up and supply defs for basis
functions.
2018-06-24 16:33:07 -07:00
Simon Forman 968556c7f3 Simple type inference and compiler.
The compiler works for the subset of Joy functions that deal strictly in
manipulating stacks and their contents.
2018-06-21 21:23:34 -07:00
Simon Forman ca05ea404a Bunches of new docs.
Type inference!

A new treatment of recursion combinator patterns.
2018-06-21 21:13:50 -07:00
Simon Forman 049cfd22b7 Elegant definitions for un-, bin-, tern-ary combinators. 2018-06-13 10:24:36 -07:00
Simon Forman 33f34dd15b Rename pushback() to concat(). 2018-06-13 10:17:46 -07:00
Simon Forman 507d045a3d Cleaning up docs. 2018-06-07 12:37:32 -07:00
Simon Forman c60d54d009 Minor docs edits. 2018-06-06 11:32:19 -07:00
Simon Forman 637d4efa6a Minor docs cleanup. 2018-06-06 11:20:31 -07:00
Simon Forman 37c34fc54f Added cond and cmp to library. 2018-06-06 07:56:24 -07:00
Simon Forman dbb1fcf4a2 Adding params to the docstrings. 2018-04-30 10:16:04 -07:00
Simon Forman cfbd9a5182 ReST docs & library edits for Sphinx
Used Pandoc to convert the notebooks to rst format.  Used 2to3 to edit
the function signatures that were causing sphinx to error out.  Am I
really the only one who uses that syntax?
2018-04-24 22:07:21 -07:00
Simon Forman 147641611d Working on the Sphinx docs.
I had to remove the tuples from the args specs, sphinx had kittens.

I see value both in the autodoc for library.py and the library examples
Jupyter notebook (converted to ReST format) so I'm including them both.

Calling the library module autodocs the "Function Reference".
2018-04-24 21:01:16 -07:00
Simon Forman 93b35593d4 Sphinx docs coming along.
It's so pretty!  Make me want to write more docs.  :-)

Some weird bug parsing the library.py module though.  D'oh!
2018-04-22 22:44:49 -07:00
Simon Forman 7c80a22851 Minor cleanup of the README file. 2018-04-22 09:16:48 -07:00
Simon Forman 669c86cbf1 Change project name to Thun.
I waited too long to upload to PyPI and some other bastard snagged the name.  I originally wanted to call it "Thun" as a tribute to Manfred von Thun, but I was concerned that this might seem to violate the thrid clause in the license of the original Joy code, to wit:

3. The name of the author may not be used to endorse or promote products  derived from this software without specific prior written permission.

Since the author is deceased I don't know of whom to ask permission to call this project Thun, but since I am not trying to "endorse or promote" this project with his name it should be alright.  In any event if anyone complains I can rename the project again.
2018-04-21 21:26:41 -07:00
Simon Forman a3c3709e4c Let the name of wrapped functions appear in tracebacks. 2018-04-21 15:37:19 -07:00
Simon Forman f7e78b6050 Switch to functions from classes for FunctionWrappers. 2018-04-21 15:20:46 -07:00
Simon Forman a682537597 Minor cleanup. 2018-04-21 11:53:02 -07:00
Simon Forman a61dc4c5d9 Efficient and elegant recursive pushback() function.
Can overflow recursion limit (typically 1000.)
2018-04-21 11:41:20 -07:00
Simon Forman 4064ac1d23 When loading definitions ignore lines w/o "==". 2018-04-21 11:40:00 -07:00
Simon Forman 9805f479be Ignore build dir and pyc files. 2018-04-16 21:21:02 -07:00
Simon Forman 1e510de8ae Testing workflow.
Correcting a typo.
2018-04-16 12:43:28 -07:00
Simon Forman fac17ceb7c Bringing over some changes.
I need to harmonize my local repo and the OSDN repo.
2018-04-16 12:27:52 -07:00
Simon Forman beb7155b4a Initial move of code from git repo. 2018-04-14 18:13:13 -07:00