Commit Graph

455 Commits

Author SHA1 Message Date
Chris Penner
19fbc12be9 Improved output for deletions 2021-11-18 17:32:07 -06:00
Chris Penner
14fe2a0934 Ensure we get type references from Constructor Refs 2021-11-18 17:04:16 -06:00
Chris Penner
9af105f191 WIP checkpoint 2021-11-18 15:20:58 -06:00
Chris Penner
6e2e452982 Merge branch 'trunk' into cp/order-branch-modifications-1552 2021-11-18 10:16:50 -06:00
Chris Penner
71e0a80bc9 Don't use recursion in stepManyAt0M 2021-11-17 17:22:35 -06:00
Chris Penner
0358ad2b1d Merge remote-tracking branch 'origin/trunk' into cp/namespace-dependencies 2021-11-16 15:53:57 -06:00
Chris Penner
15414f38ed Merge branch 'trunk' into cp/namespace-dependencies 2021-11-16 10:26:19 -06:00
Mitchell Rosen
856b58cd39 improve docs of codebase abstraction 2021-11-12 20:59:03 -05:00
Chris Penner
f82944027e Reimplement dependency analysis to use Labelled dependency helpers 2021-11-12 16:29:58 -06:00
Chris Penner
ceee2705ae PR feedback 2021-11-12 12:49:09 -06:00
Arya Irani
8da0e284ac Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase
# Conflicts:
#	parser-typechecker/tests/Unison/Test/DataDeclaration.hs
#	parser-typechecker/tests/Unison/Test/Term.hs
2021-11-11 23:22:09 -05:00
Arya Irani
61d1139870
Merge pull request #2625 from unisonweb/topic/reexport-hash
re-export U.Util.Hash(Hash) as Unison.Hash(Hash)
2021-11-11 23:16:05 -05:00
Arya Irani
86dfc171cf pull Hashable into Hashing.V2 internals and out of Causal 2021-11-11 23:10:33 -05:00
Arya Irani
62aa739d87 Merge branch 'topic/rehash-codebase' into topic/rehash-codebase-reexport-hash
# Conflicts:
#	unison-cli/src/Unison/Codebase/Editor/HandleInput.hs
#	unison-cli/src/Unison/CommandLine/OutputMessages.hs
2021-11-11 12:18:47 -05:00
Arya Irani
14489cc2ed Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/CommandLine/OutputMessages.hs
#	parser-typechecker/src/Unison/PrettyPrintEnv.hs
#	unison-src/transcripts/merges.output.md
#	unison-src/transcripts/reflog.output.md
#	unison-src/transcripts/squash.output.md
2021-11-11 12:06:00 -05:00
Arya Irani
49ba703764 merge trunk and 2625 2021-11-11 00:38:29 -05:00
Arya Irani
5a34dc8bf3 re-export U.Util.Hash(Hash) as Unison.Hash(Hash)
and clean up some aspects of and usages of the apis
2021-11-10 23:36:54 -05:00
Arya Irani
d136f684af move hashing of Kind to hashing pseudopackage 2021-11-10 20:06:35 -05:00
Mitchell Rosen
9a12aafb62 reintroduce some necessary laziness 2021-11-10 19:54:42 -05:00
Dan Doel
e742dfb642 Guard against improper eta reductions
- The eta reducer was converting `x -> f x x` to `f x`
2021-11-10 17:35:27 -05:00
Chris Penner
7c03b3ad86 Merge branch 'trunk' into cp/namespace-dependencies 2021-11-10 15:24:02 -06:00
Chris Penner
b39597b060 Clean up 2021-11-10 15:22:58 -06:00
Mitchell Rosen
056db7d4a7 ⅄ trunk → 21-11-10-reftypes 2021-11-10 15:36:51 -05:00
Mitchell Rosen
434188b695 propagate ConstructorReference everywhere 2021-11-10 15:28:39 -05:00
Chris Penner
d4d4a444ef Compiling with table layout 2021-11-10 13:18:25 -06:00
Mitchell Rosen
31c735dd05 generalize types a bit 2021-11-10 12:21:16 -05:00
Mitchell Rosen
a4bbc03ad9 Add TermReference, TypeReference, ConstructorReference 2021-11-10 12:14:47 -05:00
Arya Irani
1c2a5c6fe4 salt v2 hashes with version number
this seems like an ok place to put this, but i'm not 100% set
this module I guess should move into hashing v2 pseudopackage though, after
updating how Causal hashes are computed, to also use v2 pseudopackage
2021-11-10 11:53:43 -05:00
Mitchell Rosen
070db99afd Make PrettyPrintEnv only contain named things 2021-11-08 17:29:41 -05:00
Chris Penner
88b7015245 Merge commit 'db9ba82a9' into cp/namespace-dependencies 2021-11-08 10:57:46 -06:00
Chris Penner
de5833398d Attempt to find all constructor refs 2021-11-04 16:51:00 -06:00
Arya Irani
4a7b0f5604 Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase
# Conflicts:
#	unison-core/src/Unison/Reference.hs
#	unison-core/src/Unison/Referent'.hs
2021-11-03 10:48:13 -04:00
Chris Penner
842aa4a0bd Merge remote-tracking branch 'origin/topic/rehash-codebase' into topic/rehash-codebase 2021-11-02 12:37:01 -06:00
Mitchell Rosen
6344a417c8 Add type signatures and scoped type variables to get everything loadable
into one ghci session
2021-11-02 14:34:56 -04:00
Chris Penner
94fcea6eea migrate watch 2021-11-02 12:21:49 -06:00
Arya Irani
2ed8e687ad Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase
# Conflicts:
#	codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
#	codebase2/util/package.yaml
#	codebase2/util/unison-util.cabal
#	parser-typechecker/src/Unison/Codebase/Branch.hs
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/Codebase/Editor/Propagate.hs
#	parser-typechecker/src/Unison/Hashing/V2/Convert.hs
#	parser-typechecker/src/Unison/Hashing/V2/DataDeclaration.hs
#	parser-typechecker/src/Unison/Hashing/V2/Term.hs
#	parser-typechecker/src/Unison/Hashing/V2/Type.hs
#	unison-core/src/Unison/ABT.hs
#	unison-core/src/Unison/NamesWithHistory.hs
#	unison-core/src/Unison/Term.hs
#	unison-core/src/Unison/Type/Names.hs
2021-11-02 11:09:55 -04:00
Chris Penner
44843eaed3 Rough rough draft of computing namespace closure.
I'd much prefer to do this at the database level, but we don't have the
ability to do that just yet.
2021-11-01 17:10:51 -06:00
Mitchell Rosen
9650689716 ⅄ trunk → 21-10-26-edit-cycle 2021-11-01 10:42:21 -04:00
Arya Irani
66eafa927c splitting up saveBranch
factored out localToDbBranch :: BranchLocalIds -> LocalBranch -> DbBranch
and dbToLocalBranch :: DbBranch -> (BranchLocalIds, LocalBranch)
into U.Codebase.Sqlite.Branch.Format.hs

and split that functionality out of Ops.loadBranch

created MigrateSchema12.DbHelpers module (name tbd)
to convert from db format to hashing format

threw away junk from Hashing.V2.Referent, including ConstructorType
consolidated references to ConstructorId
accidentally formatted Pattern.hs, V2/Term.hs
2021-10-29 17:49:57 -04:00
Mitchell Rosen
346e55d80f ⅄ trunk → 21-10-26-edit-cycle 2021-10-29 10:36:57 -04:00
Mitchell Rosen
8464f31ece remove monotonic maps that use Name.cons 2021-10-28 17:43:41 -04:00
Mitchell Rosen
fef65dbeab edit components 2021-10-28 10:33:25 -04:00
Mitchell Rosen
502b89f6d5 work on 10/26 2021-10-26 23:31:57 -04:00
Mitchell Rosen
0a978e93ad delete old name 2021-10-26 12:42:40 -04:00
Mitchell Rosen
3d529a3efa Fix endsWithSegments, add endsWithReverseSegments 2021-10-26 11:36:50 -04:00
Mitchell Rosen
9f87891643 add some comments to Name 2021-10-26 10:57:14 -04:00
Mitchell Rosen
ad7ed42ff9 add note about monotonic maps 2021-10-26 10:53:21 -04:00
Mitchell Rosen
394201e9ae make endsWithSegments less weird 2021-10-25 17:34:11 -04:00
Mitchell Rosen
e06427617b remove instance Hashable Name 2021-10-25 17:26:50 -04:00
Mitchell Rosen
fc7b6d9c22 ⅄ trunk → 21-10-07-name-refactor 2021-10-25 14:57:58 -04:00
Mitchell Rosen
9dd25091a8 get migrate12 compiling 2021-10-25 14:18:07 -04:00
Chris Penner
767b08fc48 Remove unused Data instance 2021-10-25 09:17:27 -06:00
Chris Penner
e9e3972689 More rewrites 2021-10-24 22:49:41 -06:00
Chris Penner
3946e25e8c Reference Traversals 2021-10-24 22:17:48 -06:00
Chris Penner
0f27a1467d Rearrange imports 2021-10-23 13:59:31 -06:00
Chris Penner
58539b98c4 Export lists to ABT, remove dead code 2021-10-23 13:37:48 -06:00
Chris Penner
e013511dd8 More transformations 2021-10-22 12:52:10 -06:00
Chris Penner
5f495f0147 Implement migrateDeclComponent 2021-10-21 14:10:43 -06:00
Mitchell Rosen
564d0e67b4 ⅄ trunk → 21-10-07-name-refactor 2021-10-21 14:43:15 -04:00
Mitchell Rosen
4c800fd9bd ⅄ trunk → 21-10-07-name-refactor 2021-10-19 10:22:52 -04:00
Chris Penner
8fa5b873e5 Fix regression on tab-completing hash-qualified ambiguous names 2021-10-18 15:51:29 -06:00
Mitchell Rosen
4415a3d1c0 eliminate another usage of an empty name 2021-10-18 10:56:47 -04:00
Chris Penner
ca9e834849 Move and rename all '*0' combinators into the Names module 2021-10-16 23:33:15 -06:00
Chris Penner
60161107a0 Fix rogue find/replace 2021-10-16 22:57:15 -06:00
Chris Penner
64c9d42fba Make Names no longer polymorphic, it was completely unused. 2021-10-16 22:43:50 -06:00
Chris Penner
14f2c1a02e UnqualifiedNames -> Names 2021-10-16 22:19:33 -06:00
Chris Penner
e691517926 Remove HQNames, they're unused 2021-10-16 22:12:57 -06:00
Chris Penner
5b00393245 Move imports of Unqualified Names to Unison.Names 2021-10-16 22:10:30 -06:00
Chris Penner
5d85da319c WIP 2021-10-16 22:01:14 -06:00
Chris Penner
3eeec04e35 Names2 -> Names 2021-10-16 21:41:22 -06:00
Chris Penner
acaad5d59d Names3 -> NamesWithHistory 2021-10-16 21:40:44 -06:00
Chris Penner
9d4dbafd16 Names3 -> NamesWithHistory; Names2 -> Names 2021-10-16 21:37:28 -06:00
Arya Irani
d9cd5d914e Merge remote-tracking branch 'origin/trunk' into topic/remove-cycle-length
# Conflicts:
#	codebase2/codebase-sqlite/U/Codebase/Sqlite/Operations.hs
#	parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
#	parser-typechecker/src/Unison/Codebase/SqliteCodebase/Conversions.hs
#	parser-typechecker/src/Unison/Hashing/V1/Convert.hs
#	parser-typechecker/src/Unison/Hashing/V1/DataDeclaration.hs
#	parser-typechecker/src/Unison/Hashing/V1/Pattern.hs
#	parser-typechecker/src/Unison/Hashing/V1/Reference.hs
#	parser-typechecker/src/Unison/Hashing/V1/Reference/Util.hs
#	parser-typechecker/src/Unison/Hashing/V1/Referent.hs
#	parser-typechecker/src/Unison/Hashing/V1/Term.hs
#	parser-typechecker/src/Unison/Hashing/V1/Type.hs
#	parser-typechecker/src/Unison/Hashing/V2/Reference.hs
#	parser-typechecker/src/Unison/Hashing/V2/Term.hs
#	parser-typechecker/src/Unison/Hashing/V2/Type.hs
#	parser-typechecker/src/Unison/Runtime/ANF/Serialize.hs
#	parser-typechecker/unison-parser-typechecker.cabal
#	unison-core/src/Unison/DataDeclaration.hs
#	unison-core/src/Unison/Reference.hs
#	unison-core/unison-core1.cabal
2021-10-14 21:26:56 -04:00
Arya Irani
63922ec6a5 Merge remote-tracking branch 'origin/trunk' into topic/v1-cleanup 2021-10-14 16:26:56 -04:00
Arya Irani
b971ea0277 some comments & cleanup 2021-10-14 16:18:28 -04:00
Mitchell Rosen
30a4ea4520 add missing empty name case in unsafeFromText 2021-10-14 00:10:29 -04:00
Mitchell Rosen
0579bb68b8 relativeFromSegment(s) -> fromSegment(s) 2021-10-13 23:14:43 -04:00
Mitchell Rosen
fd99ecb1e1 optimize compareSuffix a bit 2021-10-13 23:11:26 -04:00
Mitchell Rosen
ed0a850a56 fix small incompatibility in endsWithSegments 2021-10-13 23:06:09 -04:00
Mitchell Rosen
6931124ddd begin cleaning up and documenting Name module 2021-10-13 18:17:59 -04:00
Mitchell Rosen
7aee1e9d61 skip joinDot test if second name is absolute 2021-10-13 12:39:59 -04:00
Mitchell Rosen
4628280032 fix bug in relativeSegments 2021-10-13 12:34:34 -04:00
Mitchell Rosen
45dfaf4f7f fix bug in Name.unsafeFromText
it was parsing "base.." incorrectly
2021-10-13 12:32:01 -04:00
Mitchell Rosen
3b1bd25a10 fix suffixes, which was reversed
also make suffixes' not infinite loop
2021-10-13 12:04:17 -04:00
Mitchell Rosen
5caef015b2 Name: make "." parse as a relative ".", rather than a bogus empty absolute name 2021-10-13 11:58:14 -04:00
Mitchell Rosen
4d72bcc206 ⅄ 21-10-07-no-empty-names → 21-10-07-name-refactor 2021-10-13 11:46:47 -04:00
Mitchell Rosen
b06a1271e2 organize the Name module a bit 2021-10-13 11:44:41 -04:00
Mitchell Rosen
30375763f3 ⅄ trunk → 21-10-07-no-empty-names 2021-10-13 11:42:07 -04:00
Mitchell Rosen
f41382efb4 cleanup/refactoring 2021-10-13 01:20:05 -04:00
Mitchell Rosen
6bc739080e switch internal representation of Name 2021-10-12 17:58:15 -04:00
Chris Penner
3b7e94d9a3 Update and standardize licenses 2021-10-12 13:47:08 -06:00
Mitchell Rosen
b318dd31ef Merge branch '21-10-07-no-empty-names' into 21-10-07-name-refactor 2021-10-12 12:38:06 -04:00
Mitchell Rosen
ac957c6f2e Remove unused instance Semigroup Name 2021-10-08 14:23:53 -04:00
Mitchell Rosen
8bbb9660e2 Remove Monoid instance of Name
In doing so, the term/type names inside a SearchResult had to change
from HashQualified' (named) to HashQualified (possibly hash only), which
they effectively already were, albeit with bogus empty names in the
hash-only case.
2021-10-08 14:19:40 -04:00
Mitchell Rosen
acef9fcb07 add regression test suite for name refactor 2021-10-07 17:36:00 -04:00
Mitchell Rosen
f73723082b add duplicated "old name" API 2021-10-07 16:29:18 -04:00
Mitchell Rosen
1f793504ee do not export Name constructor 2021-10-07 16:04:44 -04:00
Mitchell Rosen
da3feff5ef Remove Generic instance of Name 2021-10-07 16:03:23 -04:00
Mitchell Rosen
265c726936 add some more default extensions 2021-10-07 15:52:14 -04:00
Chris Penner
119356031a Typos and docs 2021-10-07 13:38:21 -06:00