Commit Graph

3726 Commits

Author SHA1 Message Date
Arya Irani
f997414380
Update README.md 2019-03-19 23:11:40 -04:00
Paul Chiusano
da8b7fca5f
Merge pull request #395 from unisonweb/topic/align-haskeline
add ANSI-patched haskeline as a submodule
2019-03-19 22:34:29 -04:00
Arya Irani
64e26f386f unbreak haskeline for ghcid 2019-03-19 22:11:04 -04:00
Paul Chiusano
37ac2df7eb Merge branch 'master' of https://github.com/unisonweb/unison 2019-03-19 21:37:40 -04:00
Paul Chiusano
b37b1231a6 filled in the rest of Map 2019-03-19 21:35:20 -04:00
Paul Chiusano
487540d35d
Merge pull request #401 from unisonweb/topic/edit.list
add `builtins.update` and `edit.list` commands
2019-03-19 21:07:52 -04:00
Paul Chiusano
fc3216a915 WIP on pure Unison Map implementation 2019-03-19 18:27:11 -04:00
Arya Irani
e630f81e18 make edit.list output prettier:
```
master> edit.list

  Edited Terms:
    foo#6bk -> foo
    foo     -> foo#6bk
```

There shouldn't be a cycle, but that's a separate issue! :)
2019-03-19 17:41:36 -04:00
Arya Irani
889d8ae637 use the actual command name in examples 2019-03-19 17:15:21 -04:00
Arya Irani
ad0d6f5091 Merge branch 'master' into topic/edit.list
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/Actions.hs
2019-03-19 16:38:53 -04:00
Arya Irani
1b1511ba87 fix(?) bug in populating dependent index of builtins 2019-03-19 16:35:28 -04:00
Paul Chiusano
71753be165
Merge pull request #399 from unisonweb/topic/bytes
`Bytes` type
2019-03-19 15:53:40 -04:00
Arya Irani
55d5cff0cc edit.list ugly prints the termEdits/typeEdits 2019-03-19 14:55:27 -04:00
Paul Chiusano
1a53882270 removed Util.Sequence experiment, too much work for now 2019-03-19 14:05:14 -04:00
Paul Chiusano
174d08a2af Merge remote-tracking branch 'origin/master' into topic/bytes 2019-03-19 13:59:48 -04:00
Paul Chiusano
22e49cbcfd Bytes type 2019-03-19 13:59:06 -04:00
Arya Irani
9617f01907 notify the user when creating a new branch 2019-03-19 13:36:38 -04:00
Paul Chiusano
9583fe174f fix bug in take 2019-03-19 01:16:58 -04:00
Paul Chiusano
fc324bc890 bytes type WIP 2019-03-19 00:51:17 -04:00
Paul Chiusano
c356af92f4 sequence type experiment 2019-03-18 23:31:16 -04:00
Arya Irani
2dc4477828 add update-builtins command + some cleanup
- Inserted calls to `backtick` for any quoted commands in messages;
eventually we might want something more interesting than just backticks.
I considered switching them to `P.bold` but that is used in other places.
We should come up with some rendering guidelines so we can have
consistency across commands.
2019-03-18 18:29:45 -04:00
Arya Irani
cbd1bb44fd Print out a message when the branch's builtins vary from the default empty branch's. 2019-03-18 16:11:04 -04:00
Paul Chiusano
2f88fa9651
Merge pull request #394 from unisonweb/topic/universals
Universal.{<,>,<=,>=,compare} functions
2019-03-18 16:01:57 -04:00
Arya Irani
39ddf91c0e add ANSI patched haskeline as a submodule 2019-03-18 14:29:09 -04:00
Paul Chiusano
bd115d43c2 docs, renamed Hashtable -> CycleTable, as it's not really a general purpose hash table 2019-03-18 14:28:38 -04:00
Paul Chiusano
dc38515303 Universal.{compare, <, >, <=, >=}
Updated some tests that were previously relying on TDNR to use the correct comparison function.
2019-03-18 13:42:53 -04:00
Paul Chiusano
104488c6f5 wip on universal ord 2019-03-18 12:31:11 -04:00
Paul Chiusano
9b02c454b7
Merge pull request #393 from unisonweb/topic/universals
Universal equality mergeable WIP
2019-03-18 09:29:39 -04:00
Paul Chiusano
c0977a2610 fixed decompileIR 2019-03-18 09:23:58 -04:00
Paul Chiusano
f6870d8573 Merge remote-tracking branch 'origin/master' into topic/universals 2019-03-17 20:05:52 -04:00
Paul Chiusano
80b459af24 restore old names for builtins and update tests that were relying on TDNR for == 2019-03-17 20:05:44 -04:00
Arya Irani
7fc79dd5ed consolidate the many ways (and info sources) of creating a new branch 2019-03-15 19:21:15 -04:00
Paul Chiusano
f2661c57fc Merge remote-tracking branch 'origin/master' into topic/universals
# Conflicts:
#	parser-typechecker/src/Unison/Runtime/IR.hs
2019-03-15 11:33:47 -04:00
Paul Chiusano
fe4f3b725f
Merge pull request #392 from francisdb/closeemptyblock
fix #378 close empty = blocks
2019-03-15 11:16:42 -04:00
Francis De Brabandere
b803ca10b2 fix #378 close empty = blocks 2019-03-15 16:07:37 +01:00
Paul Chiusano
89b129139b universal == seems to be working 2019-03-14 18:51:19 -04:00
Arya Irani
db7a9697b1
Merge pull request #391 from unisonweb/topic/forward-autocompletion
forward-autocompletion and exact matching for `view` / `edit` commands
2019-03-14 16:21:29 -04:00
Arya Irani
88171d5ee6 use forward-autocompletion and exact matching for view / edit commands 2019-03-14 16:11:04 -04:00
Paul Chiusano
37f25fd12c Merge branch 'master' into topic/universals 2019-03-14 15:50:13 -04:00
Paul Chiusano
86895a91c3 noncompiling wip 2019-03-14 15:47:51 -04:00
Arya Irani
7b44dc17e5
Merge pull request #389 from unisonweb/topic/lambdacase
add LambdaCase to .cabal extensions and remove from .hs
2019-03-14 13:48:11 -04:00
Arya Irani
e35a3229b1 plus one straggler 2019-03-14 12:48:27 -04:00
Arya Irani
a383bb4896 Merge remote-tracking branch 'origin/master' into topic/lambdacase
# Conflicts:
#	parser-typechecker/src/Unison/Lexer.hs
2019-03-14 12:44:55 -04:00
Arya Irani
8c7f622ebb add LambdaCase to cabal extensions (library only) and remove from .hs files 2019-03-14 12:43:40 -04:00
Paul Chiusano
f1b9488ce5
Merge pull request #388 from unisonweb/fix/387
Fix escaping issues in lexer
2019-03-14 11:34:06 -04:00
Paul Chiusano
3ac246a19d fix for #387 2019-03-14 11:13:34 -04:00
Arya Irani
fece2d0e1c Merge remote-tracking branch 'origin/master' into topic/ls-l 2019-03-14 08:57:19 -04:00
Paul Chiusano
41a14becef
Merge pull request #385 from mrdziuban/effect-printer
Fix printing braces in effects
2019-03-14 08:47:12 -04:00
Arya Irani
9e234e6430 Merge remote-tracking branch 'origin/master' into topic/ls-l 2019-03-13 23:02:50 -04:00
Arya Irani
1bbb14368c implement ls -l and thread ColorText thru places 2019-03-13 23:02:40 -04:00