Runar Bjarnason
|
3fe5b6d76a
|
Propagate works
|
2019-01-30 11:22:55 -05:00 |
|
Paul Chiusano
|
456c15c914
|
add todo
|
2019-01-29 17:36:01 -05:00 |
|
Paul Chiusano
|
9d417eaeff
|
propagate hooked up to add/update commands
|
2019-01-29 17:17:15 -05:00 |
|
Paul Chiusano
|
5cdbc33b0d
|
If it's a type, don't return anything from unhashComponents since there's no propagation to do
|
2019-01-29 16:57:20 -05:00 |
|
Paul Chiusano
|
3fabb89dbc
|
Hooked up call to typechecker
|
2019-01-29 16:53:46 -05:00 |
|
Arya Irani
|
079e40ffc7
|
wip in case i lose everything with apple support
|
2019-01-29 16:43:08 -05:00 |
|
Paul Chiusano
|
fe65edd8e9
|
typecheckTerms almost filled in
|
2019-01-29 16:39:01 -05:00 |
|
Paul Chiusano
|
9836d8663c
|
hook up retypechecking logic for subtype replacements
still one function stubbed out that needs filling in
|
2019-01-29 15:32:48 -05:00 |
|
Paul Chiusano
|
b69d9eb0d5
|
formatting
|
2019-01-29 14:00:13 -05:00 |
|
Paul Chiusano
|
49c7e65f78
|
filled in putTermComponent
|
2019-01-29 13:50:45 -05:00 |
|
Runar Bjarnason
|
846ece4017
|
propagate under construction
|
2019-01-29 12:57:50 -05:00 |
|
Paul Chiusano
|
d975836d04
|
filled in unhashComponent for terms
|
2019-01-29 11:06:36 -05:00 |
|
Paul Chiusano
|
24afe2b95a
|
code compiles, started on unhashComponent (formerly abstractComponent)
|
2019-01-29 09:46:46 -05:00 |
|
Runar Bjarnason
|
cb1edcfbba
|
wip on propagate
|
2019-01-28 17:35:29 -05:00 |
|
Runar Bjarnason
|
9ef5cbaad9
|
propagate wip
|
2019-01-28 13:20:22 -05:00 |
|
Paul Chiusano
|
9c79a22858
|
Merge pull request #306 from noahhaasis/parser-revamp
Remove obsolete TODO
|
2019-01-27 09:24:14 -05:00 |
|
Noah Haasis
|
1fcc52c00e
|
Remove obsolete TODO
|
2019-01-27 07:26:51 +01:00 |
|
Arya Irani
|
8c6cc01fbc
|
Merge pull request #305 from unisonweb/topic/hash-qualified-ls
hash-qualified names in `list`, `view`
|
2019-01-26 19:33:34 -05:00 |
|
Arya Irani
|
677ec430c7
|
hash-qualified names in list, view
|
2019-01-26 19:18:09 -05:00 |
|
Arya Irani
|
e3f52aa4b6
|
docs
|
2019-01-25 19:57:33 -05:00 |
|
Paul Chiusano
|
375bb24f22
|
Merge pull request #304 from unisonweb/wip/display-edit-conflicts
`todo` command now shows both edit and name conflicts nicely
|
2019-01-25 16:14:52 -05:00 |
|
Paul Chiusano
|
0ed2e8fd03
|
resolved conflicts due to signature change
|
2019-01-25 15:57:21 -05:00 |
|
Paul Chiusano
|
6899f8423e
|
Merge remote-tracking branch 'origin/master' into wip/display-edit-conflicts
|
2019-01-25 15:35:49 -05:00 |
|
Paul Chiusano
|
d4cb67361a
|
cleanup of formatting, and added Pretty.name combinator for showing names, with stuff after hash styled differently
|
2019-01-25 15:35:08 -05:00 |
|
Arya Irani
|
4a2fe588e9
|
oops
|
2019-01-25 12:57:51 -05:00 |
|
Arya Irani
|
9abf54772f
|
fix some stuff around hash-qualified output, and updated some messages
|
2019-01-25 12:57:09 -05:00 |
|
Runar Bjarnason
|
494809d33f
|
Resolve term/type conflict
|
2019-01-25 12:21:26 -05:00 |
|
Arya Irani
|
6e270025b0
|
cleanup
|
2019-01-25 12:13:37 -05:00 |
|
Arya Irani
|
e894636ff5
|
Branch.prettyPrintEnv1 now disambiguates conflicted names with #hash
|
2019-01-25 12:13:19 -05:00 |
|
Paul Chiusano
|
c6aa8910cb
|
filled in rest of todos for displaying edit conflicts and name conflicts (untested)
|
2019-01-24 23:42:19 -05:00 |
|
Paul Chiusano
|
24c936b1af
|
Hooked up display of edit conflicts
Still need to fix up the display of name conflicts to not show if it's also an edit conflict, and some wordsmithing / formatting tweaks
|
2019-01-24 17:31:57 -05:00 |
|
Paul Chiusano
|
c12a8324dd
|
main entry point for resolving type edit conflicts
|
2019-01-24 16:40:30 -05:00 |
|
Paul Chiusano
|
8681519b82
|
main resolve function, handles edit conflicts (which may or may not have associated name conflicts)
|
2019-01-24 16:30:46 -05:00 |
|
Runar Bjarnason
|
a5f88fb53a
|
unreplaceType and unreplaceTerm
|
2019-01-24 16:17:35 -05:00 |
|
Paul Chiusano
|
45d20523bd
|
fix compile errors
|
2019-01-24 14:41:34 -05:00 |
|
Arya Irani
|
1a9f37278b
|
wip
|
2019-01-24 12:44:53 -05:00 |
|
Paul Chiusano
|
546c09a86a
|
Stubbed out a bunch of definitions we need
Codebase.propagate'
Branch.unreplaceTerm/Type
Branch.resolveConflictedTerm/Type
|
2019-01-24 10:54:29 -05:00 |
|
Paul Chiusano
|
d9d81f93d9
|
added unreplaceTerm/Type and tweak replaceTerm/Type to not add identity replacements
|
2019-01-23 17:03:44 -05:00 |
|
Arya Irani
|
1c9ef33393
|
display name conflicts in todo
|
2019-01-23 13:06:48 -05:00 |
|
Arya Irani
|
23cfbc0d21
|
fix: todo command should filter dependents / dependencies by the current branch
|
2019-01-23 11:39:37 -05:00 |
|
Paul Chiusano
|
d7991ccbd9
|
Merge pull request #302 from unisonweb/fix/301
Fix for #301
|
2019-01-22 14:36:15 -05:00 |
|
Paul Chiusano
|
ddcbef3903
|
Fix for #301
|
2019-01-22 14:28:54 -05:00 |
|
Paul Chiusano
|
2aeae346ee
|
Fix for #294, thanks to @francisdb for identifying root cause
|
2019-01-22 13:57:05 -05:00 |
|
Paul Chiusano
|
74d9a8980f
|
some fixes to formatting
also removed copy of putPrettyLn
|
2019-01-22 12:13:38 -05:00 |
|
Paul Chiusano
|
e49a560cfa
|
Merge pull request #299 from unisonweb/topic/editcommnad
`edit` command
|
2019-01-22 11:37:10 -05:00 |
|
Paul Chiusano
|
55c7ac6795
|
Added some loop state so that edit command doesn't trigger a round of typechecking for the definition just output to the file
|
2019-01-21 11:14:02 -05:00 |
|
Paul Chiusano
|
3fa3c1bb23
|
Merge pull request #300 from francisdb/master
better error message when scala is not found on the path #295
|
2019-01-21 09:10:39 -05:00 |
|
Francis De Brabandere
|
c220fee7e9
|
better error message when scala is not found on the path #295
|
2019-01-21 11:34:31 +01:00 |
|
Paul Chiusano
|
fc84408a81
|
basic edit command seems to be working
|
2019-01-20 16:17:49 -05:00 |
|
Paul Chiusano
|
51f3f6a3e9
|
wip
|
2019-01-19 15:26:04 -05:00 |
|