Commit Graph

3750 Commits

Author SHA1 Message Date
Runar Bjarnason
eed504776f Fix broken continuation at completion of IO 2019-03-22 16:04:56 -04:00
Runar Bjarnason
81a6a4a796 Merge branch 'master' of github.com:unisonweb/unison into topic/io 2019-03-22 15:52:39 -04:00
Arya Irani
32d5310f4e CLI be able to refer to numbered results from previous commands 2019-03-22 15:30:01 -04:00
Paul Chiusano
55b1d9bd5c add pending test for underapply ability check failure 2019-03-21 23:03:34 -04:00
Paul Chiusano
408c52a0a1 use more robust check for whether a binding is a function 2019-03-21 22:50:51 -04:00
Paul Chiusano
8bb95293ae closes #408 2019-03-21 22:41:40 -04:00
Arya Irani
8436b20d90 close #405 2019-03-21 13:48:55 -04:00
Arya Irani
711b83206d
Merge pull request #404 from unisonweb/topic/branch.delete
Add `branch.delete`
2019-03-21 09:29:11 -04:00
Arya Irani
e25e7ded9d move a bunch of pure logic from the IO loop to the pure loop 2019-03-20 23:08:50 -04:00
Arya Irani
50b1014a11 well that was harder than expected 2019-03-20 22:33:34 -04:00
Runar Bjarnason
35ae646c51 Repair merge 2019-03-20 18:05:23 -04:00
Runar Bjarnason
4d8de2bc4b Merge branch 'master' of github.com:unisonweb/unison into topic/io 2019-03-20 17:59:20 -04:00
Runar Bjarnason
9fc6361d49 Open and close sockets! 2019-03-20 17:58:08 -04:00
Arya Irani
c896b55524 implement branch.delete, but it isn't quite working.
It complains about throwing away some IO definitions, when it's supposed to explicitly ignore those.

Added `lastInput :: Maybe Input` to the `LoopState`.  Useful for commands that want confirmation, like `branch.delete`.

added:
```
CommandLine.plural :: Foldable f => f a -> b -> b -> b
CommandLine.plural' :: Integral a => a -> b -> b -> b
```
`plural [] "cat" "cats" = "cats"`
`plural ["meow"] "cat" "cats" = "cat"`
`plural ["meow", "meow"] "cat" "cats" = "cats"`

```
InputPatterns.helpFor :: InputPattern -> Either (P.Pretty CT.ColorText) Input
```
Returns the command to display the help for a particular input pattern; can be used to delegate in the innput args parser.

refactored LoadSearchResults into its own command, which is used in `find` and `branch.delete` output
  LoadSearchResults :: [SR.SearchResult] -> Command i v [SearchResult' v Ann]
2019-03-20 15:18:10 -04:00
Paul Chiusano
962882c46e
Merge pull request #402 from unisonweb/topic/vector-to-seq
Switched implementation of `[a]` type to use Data.Sequence and cleanup naming
2019-03-20 08:41:49 -04:00
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
Paul Chiusano
34540a8237 Switched implementation of [] type to Data.Sequence and made naming consistent ("Sequence" not "Vector") 2019-03-19 22:18:36 -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
Runar Bjarnason
2d0de09ce7 Merge branch 'master' of github.com:unisonweb/unison into topic/io 2019-03-19 17:43:25 -04:00
Runar Bjarnason
8db33295fe Unison can usefully manipulate text files now! 2019-03-19 17:42:29 -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
Runar Bjarnason
bf946832be isEOF 2019-03-19 13:23:21 -04:00
Runar Bjarnason
d212e17f1d Merge branch 'master' of github.com:unisonweb/unison into topic/io 2019-03-19 11:31:55 -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
Runar Bjarnason
5736336563 Compiles, converting io errors to Unison eithers 2019-03-18 16:42:25 -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
Runar Bjarnason
bbaddf0e04 Merge branch 'master' of github.com:unisonweb/unison into topic/io 2019-03-18 09:56:57 -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