Paul Chiusano
0b7e9d1599
it compiles
2018-10-30 09:37:09 -04:00
Paul Chiusano
345f11c220
more progress... lots of cleanup
2018-10-30 00:07:46 -04:00
Paul Chiusano
7dd1c92192
still not compiling but lots of progress
2018-10-29 17:36:02 -04:00
Runar Bjarnason
a5b08d749c
wip
2018-10-29 15:43:32 -04:00
Runar Bjarnason
905d0741b8
TDNR returns substitutions into original term.
...
Instead of the synthetic term.
2018-10-29 13:43:57 -04:00
Paul Chiusano
e3d60ebce9
barebones view command using term and type pretty printer
2018-10-28 23:07:13 -04:00
Paul Chiusano
881c7e8c45
hook PrettyPrintEnv up to prettyprinter
2018-10-28 16:11:12 -04:00
Paul Chiusano
36ed5c3256
Split PrettyPrintEnv out into separate type.
...
It's got everything you need to pretty print Unison terms or types. Still todo: switch prettyprinters over to use this.
2018-10-28 15:27:34 -04:00
Paul Chiusano
8e952b9e3e
Merge branch 'topic/codebase-editor' of https://github.com/unisonweb/unison into topic/codebase-editor
2018-10-28 11:08:09 -04:00
Arya Irani
ff951da9b8
cleanup, and move Rendered to ColorText
2018-10-27 17:01:52 -04:00
Arya Irani
a92dcb2c80
Merge branch 'topic/annotateddoc' into topic/codebase-editor
2018-10-27 16:24:54 -04:00
Arya Irani
6572c4edf4
eliminate AnnotatedDocument...
2018-10-27 16:24:25 -04:00
Paul Chiusano
62c6c52a13
wip on integrating with prettyprinter
2018-10-27 16:21:51 -04:00
Paul Chiusano
1604e137d4
Merge branch 'topic/codebase-editor' of https://github.com/unisonweb/unison into topic/codebase-editor
2018-10-27 15:27:18 -04:00
Chris Gibbs
d7b5057d08
Add prettyBinding
...
...to render bindings like this:
foo : t -> u
foo a = ...
Also tweak the various pretty' convenience interface functions.
2018-10-27 18:48:04 +01:00
Arya Irani
fb69406baa
color constants for coloring typecheckedfile
2018-10-27 13:16:18 -04:00
Chris Gibbs
5948f5af54
tweak TODO comment
2018-10-27 15:24:54 +01:00
Paul Chiusano
40a86dacbb
Merge remote-tracking branch 'origin/topic/termprinter2' into topic/termprinter-integrate
...
# Conflicts:
# parser-typechecker/tests/Unison/Test/TermPrinter.hs
# parser-typechecker/tests/Unison/Test/TypePrinter.hs
2018-10-27 02:54:07 -04:00
Arya Irani
df9aac0724
Merge branch 'topic/codebase-editor' of github.com:unisonweb/unison into topic/codebase-editor
2018-10-26 20:13:34 -04:00
Arya Irani
8e64102735
add EOF handler
2018-10-26 20:08:52 -04:00
Paul Chiusano
c4c42a10d6
add command now updates namespace, also added really barebones 'list' command
2018-10-26 19:52:59 -04:00
Paul Chiusano
539c866dd3
adding more helper functions to Branch
2018-10-26 11:03:08 -04:00
Paul Chiusano
6699c2c932
Merge branch 'topic/codebase-editor' of https://github.com/unisonweb/unison into topic/codebase-editor
2018-10-26 10:48:23 -04:00
Paul Chiusano
215fa1c874
filling in addDefinition
2018-10-26 10:48:04 -04:00
Arya Irani
1a95fa2ca4
Merge branch 'topic/codebase-editor' of github.com:unisonweb/unison into topic/codebase-editor
2018-10-26 09:26:56 -04:00
Arya Irani
12c8c59d7a
cherry-pick colortext cleanup and merge prettyTypecheckedFile'
2018-10-26 09:26:47 -04:00
Paul Chiusano
bc9fe24db9
sorting data declaration constructors by hash
2018-10-26 09:20:41 -04:00
Paul Chiusano
431137cf03
WIP actually adding the definitions to the codebase
2018-10-25 21:49:40 -04:00
Paul Chiusano
8cfb1d3913
add pattern namespace to Branch
2018-10-25 21:04:40 -04:00
Paul Chiusano
18935736e2
bit of formatting cleanup
2018-10-25 20:29:07 -04:00
Paul Chiusano
ec09ad2b28
tweaks to file printing
2018-10-25 15:25:03 -04:00
Paul Chiusano
411a939a5a
filled in 'add' command implementation and now printing out both types and terms in the file
2018-10-25 15:18:44 -04:00
Arya Irani
9db597ee5a
quick attempt at Menu.groupMenuN
2018-10-25 11:16:03 -04:00
Paul Chiusano
1a4a9f1744
convenience function
2018-10-24 21:29:42 -04:00
Chris Gibbs
9f164fba4f
Termprinter support for 'f (delay) sugar
2018-10-25 00:05:22 +01:00
Paul Chiusano
34997cc2cd
Merge remote-tracking branch 'origin/topic/codebase-editor' into wip/refrefactor
2018-10-24 18:35:38 -04:00
Paul Chiusano
ad2cf5a13d
finished with Haskell side and tests still pass
...
Just need to update Scala side
2018-10-24 18:35:16 -04:00
Chris Gibbs
25f5f46b61
Termprinter support for !f (bang/force) sugar
2018-10-24 23:14:08 +01:00
Chris Gibbs
39ed4a0acb
Revive nesting in TypePrinter
2018-10-24 21:37:03 +01:00
Chris Gibbs
ae14da1f8a
Simplify pretty-printing of infix operators
...
So it turns out there is a simpler way - just pass an extra parameter into the pattern that eats up an infix operator sequence, to control how the pattern match works.
This commit removes the tortuous code that unpicks the over-eager pattern match.
I should learn to stop sooner when things get too complicated...
2018-10-24 20:48:15 +01:00
Arya Irani
7120829c55
switch let for where
2018-10-24 11:41:54 -04:00
Paul Chiusano
4d7f772082
define hashDecls in terms of ABT.hashComponents
2018-10-24 10:41:02 -04:00
Paul Chiusano
802e4f0419
Merge remote-tracking branch 'origin/topic/codebase-editor' into wip/refrefactor
2018-10-24 10:13:46 -04:00
Paul Chiusano
f94330b0a5
wip refactoring Reference to allow a Ref to refer to a cycle
2018-10-24 10:13:29 -04:00
Arya Irani
9c04dbdc86
formatting bugs
2018-10-23 22:17:01 -04:00
Arya Irani
c2d60eb728
Merge remote-tracking branch 'origin/topic/codebase-editor' into topic/codebase-editor
2018-10-23 21:55:26 -04:00
Arya Irani
4c96b92bca
wrapping up first draft of Menu.menu1 and groupMenu1
2018-10-23 21:54:05 -04:00
Paul Chiusano
55aafdc237
Merge branch 'wip/hashComponents' into topic/codebase-editor
2018-10-23 21:38:20 -04:00
Paul Chiusano
cc70589fd7
a bit of docs on ABT.hashComponents
2018-10-23 21:37:56 -04:00
Arya Irani
7a985be04f
Merge branch 'topic/codebase-editor' into topic/menu
2018-10-23 19:08:28 -04:00
