e758d7d2be
futurize stage2 core
2020-04-23 23:28:24 -07:00
00db0fd0ad
futurize stage1 vui
2020-04-23 23:22:45 -07:00
89b4eb5e15
futurize stage1 gui
2020-04-23 23:19:29 -07:00
b0df80f3e6
futurize stage1 core
2020-04-23 23:16:45 -07:00
8d0d0de897
Fixes #38239 rename parameter of stack.pick()
2020-04-23 21:39:29 -07:00
0588496ca5
Minor cleanup.
2019-12-03 08:41:42 -08:00
fdf0339e16
Make parser REs into module-level "constants".
2019-12-02 14:26:07 -08:00
57446a1179
Minor docs update.
2019-12-02 14:13:50 -08:00
f58f3b9959
Definition of ii combinator.
...
ii == [dip] dupdip i
a [F] ii
--------------
F a F
2019-11-07 07:53:21 -08:00
df5ddb8ad9
Some trailing whitespace or something.
2019-08-09 09:28:15 -07:00
a3f863ff18
Move is_numerical() to joy.gui.utils.
2019-08-03 19:02:24 -07:00
6a94c12b9b
Get the path separator right on windows.
...
It used to use: C:\Users\sforman/.joypy
which worked, but ew.
2019-08-02 18:30:43 -07:00
84a2de7790
Tiny edits. Almost nothing.
2019-07-21 07:32:20 -07:00
c4c6ece6d2
Add bool function to mimic Python semantics.
2019-07-16 08:41:28 -07:00
0359cd64c7
Very minor docs change.
2019-07-15 15:50:22 -07:00
21b69ea260
Stop hg ignoring the build dir.
...
I want to include the HTML output of sphinx so you can view it without having to install sphinx.
2019-05-07 17:45:39 -07:00
4f5caf4ab3
More docs...
2019-05-07 13:49:27 -07:00
13515b071b
A bit more on the docs.
2019-05-07 10:23:43 -07:00
663ddab7a7
A start on docs for VUI.
...
It's hella crude yet.
2019-05-06 23:05:50 -07:00
f236be510a
Use ~/.thun instead of ~/.joypy as default JOY_HOME.
...
And some copyright notices I missed.
2019-05-06 13:54:55 -07:00
b3a79df9a9
Well, that seems to work.
...
python -m joy.vui
With PyGame installed that starts the "VUI" on my system. Neat.
The initial joy home (~/.joypy) is not quite compatible with the one set up by the GUI code. One simple way to fix that would be to e,g, make this use ~/.thun instead.
2019-05-06 13:32:08 -07:00
bae676dd42
Update initial joy home dir contents BLOB.
2019-05-06 13:28:44 -07:00
9292d00534
Update imports, copyright notices.
2019-05-06 13:26:07 -07:00
d4fdde50f9
Initial bring over of VUI code. (Won't work yet.)
2019-05-06 13:07:01 -07:00
b27adb7e1c
Remove some trailing blankspace.
2018-11-28 13:00:03 -08:00
3b0b7659b3
A bunch of docs.
...
Things have kind of run away with me. I've been working in Prolog for
the last month or so. I'm not yet sure how to bring it together with the
Python code.
2018-08-24 16:48:15 -07:00
3e6a49ac27
The version of Python with Anaconda is lightly newer.
2018-08-24 16:46:18 -07:00
c88e00ecd0
Add binary functions.
2018-08-02 14:22:42 -07:00
dae5126bfc
In progress..
2018-08-01 12:26:50 -07:00
5974c516d1
Working on compiler.
...
I have a simple dataflow thingy for some Yin and Yang functions.
2018-08-01 10:59:07 -07:00
f2425ae1ae
Minor UI bugs.
...
I should nail this down better. Command selections like ' []' were
failing to evaluate.
2018-07-22 11:53:02 -07:00
79a653c08b
Oh python, oh unicode.
2018-07-22 11:51:47 -07:00
4ed8422258
Load JOY_HOME/definitions.txt
...
You still can't edit other text files from within the UI, but at least
now you have a place to persist your own definitions over restarts.
I thought about having a [definitions] section in the config INI file,
but for some reason I prefer a separate definitions.txt file. I dunno.
Might change it in future.
2018-07-22 11:50:34 -07:00
17b9fba65e
TEXT_BINDINGS stay in textwidget.py.
2018-07-22 10:14:45 -07:00
f96362a904
Rework the default JOY_HOME contents.
2018-07-21 20:19:38 -07:00
33a952ff71
Config file and CLI arg parser.
2018-07-21 17:56:53 -07:00
ca06c626e1
Loop and while combinators.
2018-07-20 12:33:06 -07:00
b89754a30b
Futzing with types.
2018-07-19 15:37:35 -07:00
008b74aef8
Getting back to parity after jumble.
...
Polytypes module folded into types module, with all the actual type
information done when you load the library module. Some definitions can
be inferred from their body expression, others need to be
CombinatorJoyType wrapped. Still to do: loop.
2018-07-19 15:18:42 -07:00
dea6cbc8c2
Working to get types right.
2018-07-19 12:38:19 -07:00
6576e1a431
Fix TextJoyType inheritance.
2018-07-18 17:47:19 -07:00
49941f9a33
Log types at startup.
2018-07-18 17:06:51 -07:00
1e8c196c5b
Add some logging.
2018-07-18 16:14:32 -07:00
3c27fab071
Cache the results of type checking.
2018-07-18 16:13:57 -07:00
8ad4ab791b
Removing polytypes; some pylint hints.
2018-07-18 14:55:39 -07:00
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
c9f405fbe9
Nearly there maybe, maybe not.
2018-07-17 20:09:17 -07:00
73d19b1f3d
Moving right along.
...
A little clunky but it seems to work so far.
2018-07-17 17:12:27 -07:00
c2dd7cca0a
So fra, so good...
2018-07-17 12:43:24 -07:00
25b7871074
i got used to it, but Jupyter likes 4
2018-07-17 10:49:09 -07:00
14d67dd7c5
in the middle, just want to 2ify my indents...
2018-07-17 10:47:50 -07:00
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
d9d52fa224
A few more stack effects.
2018-07-16 20:28:53 -07:00
3551b6148b
expectations_of_definition() and some helper infer funcs.
2018-07-16 19:10:16 -07:00
043acd685c
More stack effects, and modify the key bindings.
2018-07-16 18:43:40 -07:00
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
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
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
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
0292e8a297
Much globals. Wow.
2018-07-14 20:58:43 -07:00
7899d68bab
Minor cleanup.
2018-07-14 20:55:34 -07:00
ebb731126d
Move load_stack() to StackDisplayWorld.
2018-07-14 20:47:04 -07:00
da03f60dca
Move StackDisplayWorld into world.py
2018-07-14 19:51:31 -07:00
ea11fbebda
Move reset() to text method.
...
Rearrange some other stuff.
2018-07-14 19:34:01 -07:00
8bbf4fc2bf
Correct some typo
...
I accidentally pasted or something.
2018-07-14 19:14:01 -07:00
6fe83256b1
Move init_text() to Text method.
2018-07-14 19:11:49 -07:00
a84966cf9b
Split some code into a utils.py module.
2018-07-14 18:51:22 -07:00
4fb9e1e003
Minor cleanup.
...
Improve the behavior of the World.
2018-07-14 18:41:36 -07:00
9ea0157969
Partial harmonize key commands.
...
Fix bug cut instead of copy.
2018-07-14 18:25:12 -07:00
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
fcf483af22
Ah, Symbols.
2018-07-11 07:12:14 -07:00
343a2f8459
Unicode in docstring.
2018-07-11 07:11:56 -07:00
0980d1b7c9
ifte as definition; "fork" combinator.
2018-07-11 07:10:54 -07:00
d95b92314e
Clean up.
2018-07-06 14:20:04 -07:00
1862ece03e
Adding support for type checking.
2018-07-06 14:19:36 -07:00
531e215ffd
Another definition for while.
2018-07-06 14:19:00 -07:00
ab8ec6c95d
Minor cleanup.
...
Renamed update() to reify() and reinstated recursive substitution.
2018-07-04 10:37:43 -07:00
4fff827338
Extra logging and another lil test.
2018-06-30 23:20:00 -07:00
ab1f5227ba
Hmm.
...
I think update() should be done better...
2018-06-30 12:59:14 -07:00
4406a6620b
Type inference of Joy expressions.
...
More remains to be done but it seems to work.
2018-06-29 13:19:12 -07:00
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
fc45727008
Minor cleanup.
2018-06-27 19:03:23 -07:00
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
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
eb739024eb
Type checking, initial work.
2018-06-26 15:23:51 -07:00
705c95ee28
Fix a couple of bug in Kleene Stars.
...
...and some minor cleanup.
2018-06-25 12:43:05 -07:00
f1979f35ce
Some more tests.
...
Damn thing seems to be working.
2018-06-25 06:51:12 -07:00
baae1a5b36
Change name of kav() to infer().
2018-06-24 18:48:22 -07:00
d874b2a134
Minor cleanup.
...
Joy type errors get their own exception class.
2018-06-24 18:39:46 -07:00
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
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
ca05ea404a
Bunches of new docs.
...
Type inference!
A new treatment of recursion combinator patterns.
2018-06-21 21:13:50 -07:00
049cfd22b7
Elegant definitions for un-, bin-, tern-ary combinators.
2018-06-13 10:24:36 -07:00
33f34dd15b
Rename pushback() to concat().
2018-06-13 10:17:46 -07:00
507d045a3d
Cleaning up docs.
2018-06-07 12:37:32 -07:00
c60d54d009
Minor docs edits.
2018-06-06 11:32:19 -07:00
637d4efa6a
Minor docs cleanup.
2018-06-06 11:20:31 -07:00
37c34fc54f
Added cond and cmp to library.
2018-06-06 07:56:24 -07:00
dbb1fcf4a2
Adding params to the docstrings.
2018-04-30 10:16:04 -07:00
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