Commit Graph

73 Commits

Author SHA1 Message Date
Arya Irani
a242094992 watchwatch will reload the last processed unison file after a haskell/scala build event...
watchwatch.sh also accepts an initial unison file as a command-line arg, e.g.
  ./scripts/watchwatch.sh scratch.u
2018-09-24 21:54:40 -04:00
Paul Chiusano
f6bc7db824 Merge remote-tracking branch 'origin/master' into topic/notebook 2018-09-23 20:52:33 -04:00
Arya Irani
6a606f3dbe introduced some error message debug flags in Unison.Settings... 2018-09-23 12:34:14 -04:00
Paul Chiusano
5fac61d934 Polish and bugfixes, feels pretty nice 2018-09-23 01:38:59 -04:00
Paul Chiusano
bade2b1050 grabbing current line for watch message now 2018-09-22 15:22:51 -04:00
Arya Irani
ce2a02f259 fix watcher to not bomb on parse errors 2018-09-21 17:48:18 -04:00
Arya Irani
ddd626bb07 create stack executable "watcher" which automatically evaluates .u files in the project root 2018-09-21 16:30:48 -04:00
Paul Chiusano
751e2b7037 now actually spawning the java process, just need to know the class name 2018-09-20 17:10:51 -04:00
Paul Chiusano
439ab64d9a server for watching files and evaluating them 2018-09-20 16:50:04 -04:00
Paul Chiusano
04ce0e95d4 Merge remote-tracking branch 'origin/topic/codebase-editor' into topic/java-streaming-bootstrap 2018-09-20 15:35:03 -04:00
Rúnar Óli Bjarnason
21df3334a2 Added a file watcher 2018-09-20 13:30:40 -04:00
Paul Chiusano
42a73ce940 started on haskell code for codebase editor 2018-09-19 15:58:40 -04:00
Paul Chiusano
2561265d36 Merge branch 'fix/effect-instantiation2' into topic/haskell-runtime 2018-09-01 14:13:37 -04:00
Arya Irani
20c39ce084 final cleanup 2018-08-30 18:58:14 -04:00
Arya Irani
59555c8bc7 wip 2018-08-27 23:29:59 -04:00
Paul Chiusano
0a3f8aa625 Merge branch 'wip/stanzas' into topic/haskell-runtime
# Conflicts:
#	parser-typechecker/src/Unison/ABT.hs
#	parser-typechecker/src/Unison/Term.hs
#	parser-typechecker/unison-parser-typechecker.cabal
2018-08-24 10:46:16 -04:00
Arya Irani
f693f8cc5a split TypeError extraction from printing; skeleton for regression tests 2018-08-23 10:23:17 -04:00
Arya Irani
6020ff2a72 added and- and or- specific type errors, but somehow broke Blockquote coloring? 2018-08-16 23:18:15 -04:00
Runar Bjarnason
47b8e5c7d3 Merge branch 'topic/typechecker-test2' of github.com:unisonweb/unison into topic/type-directed 2018-08-10 14:25:21 -04:00
Arya Irani
0e302bb040 rename Unison.Test.Typechecker2 to Typechecker 2018-08-09 16:09:46 -04:00
Arya Irani
a5f9c9729d moved the last of the tests from Unison.Test.Typechecker into individual files 2018-08-09 16:08:51 -04:00
Runar Bjarnason
f7bd352b2f TDNR while synthing a file 2018-08-09 15:39:18 -04:00
Arya Irani
ee644e79a0 Unison.Test.Typechecker2 typechecks unison files from unison-src/{tests,errors} 2018-08-06 19:47:09 -04:00
Paul Chiusano
bfbff8eec8 fix unArrows and add a simple test for it 2018-08-05 22:40:23 -04:00
Arya Irani
88086f6e3c fix off-by-one highlight end issue 2018-08-03 10:43:08 -04:00
Arya Irani
92554ae270 Merge branch 'topic/type-directed' of github.com:unisonweb/unison into topic/pretty-errors
# Conflicts:
#	parser-typechecker/src/Unison/Type.hs
#	parser-typechecker/src/Unison/UnisonFile.hs
2018-08-01 17:04:06 -04:00
Arya Irani
32df2fd8b5 render types using intercalateMap 2018-08-01 15:37:07 -04:00
Arya Irani
49f4655d6a use Annotated typeclass; refactor to improve markup api 2018-08-01 11:46:14 -04:00
Arya Irani
312e06622c unfinished but compiling 2018-07-31 15:43:09 -04:00
Rúnar Óli Bjarnason
8a6850ec18 wip 2018-07-31 15:07:32 -04:00
Arya Irani
5c19631fbc summarize a block of text into short segments according to its highlighting (non-working) 2018-07-31 00:21:18 -04:00
Arya Irani
ed044a034e ColorText wip 2018-07-30 17:04:14 -04:00
Arya Irani
c044277485 added Unison.PrintError module with functions for pretty-printing error messages 2018-07-26 23:15:54 -04:00
Rúnar Óli Bjarnason
088152fe1b Dropped in new parser 2018-07-26 17:06:12 -04:00
Paul Chiusano
f2bef5a21c Added missing try around parenthesized operators, a bunch of additional tests now passing 2018-07-25 22:50:26 -04:00
Paul Chiusano
1d02037321 fix to lexer to handle if/else/then blocks properly, added unit tests 2018-07-25 14:58:05 -04:00
Arya Irani
3a875f5e0d converted Parsers.hs and a test that depended on it (test is now failing)
Looks like we need to add calls to `try` judiciously at various places in the parser
2018-07-24 18:09:36 -04:00
Arya Irani
7160e695d8 FileParser2.dataDeclaration 2018-07-24 16:30:42 -04:00
Runar Bjarnason
8881f76f2a Term parser wip 2018-07-23 15:49:13 -04:00
Runar Bjarnason
d5ea88758b Merge branch 'master' of https://github.com/unisonweb/unison into topic/parser 2018-07-23 10:06:59 -04:00
Arya Irani
15c50a89e3 move Result and Note to Unison.Result 2018-07-19 14:00:43 -04:00
Arya Irani
e6db7284bf removed Note class from Typechecker 2018-07-19 13:50:38 -04:00
Arya Irani
de80b7a200 started replacing Context with Context2 (non-compiling) 2018-07-18 17:44:05 -04:00
Runar Bjarnason
9ce9e0e41a Merge branch 'topic/typechecker2' into topic/parser 2018-07-18 16:44:59 -04:00
Runar Bjarnason
93ca412010 Merge branch 'topic/typechecker2' into topic/parser 2018-07-18 16:43:51 -04:00
Runar Bjarnason
47855264c0 Type parser 2018-07-18 16:43:22 -04:00
Paul Chiusano
7823eff70c Surgically added locations to patterns without breaking any uses
New code should import PatternP module, old code can use Pattern module as is
2018-07-18 10:52:53 -04:00
Runar Bjarnason
fe634fb257 Parser stream instance 2018-07-17 15:19:21 -04:00
Arya Irani
a65b809b8c (noncompiling) WIP on refactoring typechecker to be able to plumb location info around and report multiple errors 2018-07-03 17:40:34 -04:00
Runar Bjarnason
87d69697e1 Parser2 2018-06-28 16:32:42 -04:00