github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-28 09:21:35 +03:00
Code Issues Projects Releases Wiki Activity
1,734 Commits 19 Branches 16 Tags 46 MiB
746723963c
Commit Graph

1605 Commits

Author SHA1 Message Date
Rob Rix
08f4e8c0e1 Wrap the diff in a hash containing both strings. 2015-10-20 18:03:04 -04:00
Rob Rix
3c8245a181 Remove the old UI fixtures. 2015-10-20 17:52:13 -04:00
Rob Rix
c19913abfd Load diff.json. 2015-10-20 17:52:04 -04:00
Rob Rix
690cbb3866 Write the output to UI/diff.json. 2015-10-20 17:51:27 -04:00
Rob Rix
5d10383f64 Ignore a hypothetical diff.json file. 2015-10-20 17:51:08 -04:00
Rob Rix
8f6d3f545e Hella diff. 2015-10-20 17:46:16 -04:00
Rob Rix
a19628c290 Write JSON for the diff to the passed path. 2015-10-20 17:46:07 -04:00
Rob Rix
261d241a53 Pass the path to the UI fixtures to doubt-json. 2015-10-20 17:45:32 -04:00
Rob Rix
5e7f3af600 Convert ranges to JSON in less than 20s. 
This is bad and I feel bad.
 2015-10-20 16:27:07 -04:00
Rob Rix
0a11552638 Separate benchmarks for JSON conversion, serializing, and decoding. 2015-10-20 15:48:08 -04:00
Rob Rix
a7e7ca3b6f Merge remote-tracking branch 'origin/parse-json' into output-source-range-annotations-to-json 2015-10-20 15:45:35 -04:00
joshvera
e8c1b36a2f ++Madness 2015-10-20 15:45:23 -04:00
joshvera
57610c88f6 ++Madness 2015-10-20 15:43:02 -04:00
Rob Rix
1bd924b7db Merge remote-tracking branch 'origin/parse-json' into output-source-range-annotations-to-json 2015-10-20 15:42:35 -04:00
joshvera
322b404651 --Madness 2015-10-20 15:41:12 -04:00
joshvera
2a9e3f7004 ++Madness 2015-10-20 15:29:31 -04:00
joshvera
390177ba60 Use noneOf for performance 2015-10-20 15:28:52 -04:00
joshvera
45d7d5ebdf syntax 2015-10-20 15:28:43 -04:00
Rob Rix
4030e06455 Benchmark JSON output. 2015-10-20 13:15:55 -04:00
Rob Rix
7f26f8e38b Benchmark diffing. 2015-10-20 13:14:19 -04:00
Rob Rix
46e9290268 Benchmark parsing. 2015-10-20 13:14:14 -04:00
Rob Rix
c63c9697b2 Add a benchmark function. 2015-10-20 13:14:03 -04:00
Rob Rix
8c890abf63 No need to double-space. 2015-10-20 12:10:04 -04:00
Rob Rix
a5b1b3d91d Indicate which string failed. 2015-10-20 12:09:38 -04:00
Rob Rix
aebb69c852 Print parse errors. 2015-10-20 12:09:03 -04:00
Rob Rix
ab2142b8d4 Remove the diff fixture thing. 2015-10-20 11:52:12 -04:00
Rob Rix
4487eb16ab Merge remote-tracking branch 'origin/parse-json' into output-source-range-annotations-to-json 
Conflicts:
	prototype/doubt-json/main.swift
 2015-10-20 11:50:24 -04:00
Rob Rix
c5e7a99acc Drop parseJSON. 2015-10-20 11:42:39 -04:00
Rob Rix
85e091d73d Read files in a single function. 2015-10-20 11:42:27 -04:00
joshvera
232d4094ff Use JSONParser in main.swift 2015-10-20 11:12:30 -04:00
joshvera
e847acaac2 Remove JSON extension to JSONLeaf 2015-10-20 11:11:17 -04:00
joshvera
eb07de5a15 parse null and boolean 2015-10-20 11:11:06 -04:00
joshvera
950750654c Parse doubles 2015-10-20 09:20:08 -04:00
joshvera
e031eb5c19 Parse tabs and endOfLines 2015-10-20 09:19:59 -04:00
joshvera
3e9561aee8 Use Madness.satisfy 2015-10-20 09:17:55 -04:00
joshvera
a39076599c Add String.lift back 2015-10-20 09:17:45 -04:00
joshvera
5a509aecd2 ++Madness 2015-10-20 09:16:52 -04:00
joshvera
958e6b2634 remove extraneous whitespace parser 2015-10-19 15:16:47 -04:00
Rob Rix
c8ff886df6 Merge branch 'master' into output-source-range-annotations-to-json 
Conflicts:
	.gitmodules
 2015-10-19 15:16:22 -04:00
Rob Rix
f1e1541d8b Diff and serialize JSON strings. 2015-10-19 15:15:38 -04:00
joshvera
89d14cf43a Remove extra whitespace parsers 2015-10-19 15:15:25 -04:00
joshvera
c310d0064a Merge branch 'master' into parse-json 
Conflicts:
	.gitmodules
 2015-10-19 15:14:14 -04:00
Josh Vera
107df1988d Merge pull request #132 from github/merge 
Merge
 2015-10-19 15:10:19 -04:00
Rob Rix
706ef4eb1c Merge remote-tracking branch 'origin/parse-json' into output-source-range-annotations-to-json 
Conflicts:
	prototype/doubt-json/main.swift
 2015-10-19 13:20:54 -04:00
Rob Rix
fbd7c1f742 Merge branch 'master' into output-source-range-annotations-to-json 2015-10-19 13:18:12 -04:00
Rob Rix
7c16e4d0cc Recover before/after states with merge. 2015-10-19 13:14:21 -04:00
Rob Rix
607fbb9672 discardNullTerms is static. 2015-10-19 13:13:52 -04:00
Rob Rix
1cf323e416 Add a partial merge method. 2015-10-19 13:12:45 -04:00
Rob Rix
8b5c0c87f8 merge returns a Term. 2015-10-19 13:10:35 -04:00
Rob Rix
415822c1af Implement merge on Free. 2015-10-19 13:05:09 -04:00
Rob Rix
a19101b89c Construct much smaller terms. 2015-10-19 12:44:59 -04:00
Rob Rix
82b7518809 Use the stripped property. 2015-10-19 12:30:39 -04:00
Rob Rix
b915679396 Correct the original state tests. 2015-10-19 12:30:04 -04:00
Rob Rix
f1407d7110 Remove a redundant lazy. 
`Dictionary.keys` is already lazy.
 2015-10-19 12:29:12 -04:00
Rob Rix
e4a0fa0654 Compare _sets_ of keys. 2015-10-19 12:10:31 -04:00
Rob Rix
fa96faa41f Shrink RangedDiffs. 2015-10-19 11:49:05 -04:00
Rob Rix
2656aa27dd RangedDiff wraps RangedTerms. 2015-10-19 11:47:52 -04:00
Rob Rix
6aa1736fbc Shrink ranged terms. 2015-10-19 11:38:32 -04:00
Rob Rix
2a313b18a1 Compute the unannotated term corresponding to ranged terms. 2015-10-19 11:37:13 -04:00
Rob Rix
e78f5d5c43 Revert "UnannotatedTerm is Equatable." 
This reverts commit 76714ae37d821e270ec2e47037cd35f03c86344b.
 2015-10-19 11:32:36 -04:00
Rob Rix
529a7163f6 Revert "UnannotatedTerm is Comparable." 
This reverts commit aac5b979c44d04566fe411cde4a9d857ef62a708.
 2015-10-19 11:32:33 -04:00
Rob Rix
91342a0431 Document the returned array. 2015-10-19 11:31:48 -04:00
Rob Rix
7236a46679 Shrink keyed nodes. 2015-10-19 11:31:44 -04:00
Rob Rix
423d804254 Document the shrunk term. 2015-10-19 11:31:35 -04:00
Rob Rix
9e6aa171a7 Factor out the case. 2015-10-19 11:28:18 -04:00
Rob Rix
2da03dbb67 Shrink outward-in. 2015-10-19 11:27:05 -04:00
Rob Rix
aea35d44e9 Drop some parens. 2015-10-19 11:18:06 -04:00
Rob Rix
7b94606558 Document paramorphism. 2015-10-19 11:17:18 -04:00
Rob Rix
d9823f144e Implement a paramorphism over TermType. 2015-10-19 11:15:44 -04:00
Rob Rix
8bd00f2414 Sort indexed alternatives. 2015-10-19 10:51:08 -04:00
Rob Rix
6e376d9d51 UnannotatedTerm is Comparable. 2015-10-19 10:50:19 -04:00
Rob Rix
df0ba4c10e Attempt to shrink indexed terms. 2015-10-19 10:50:14 -04:00
Rob Rix
fe3236f7bb UnannotatedTerm is Equatable. 2015-10-19 10:49:25 -04:00
Rob Rix
f440cf170e Shrink by case analysis. 2015-10-19 10:47:24 -04:00
Rob Rix
b693578099 Stub in shrinking. 2015-10-19 10:35:58 -04:00
Rob Rix
4be6e61001 Implicit returns. 2015-10-19 10:35:55 -04:00
Rob Rix
0cc7889ae1 Skip equal terms. 2015-10-19 09:52:15 -04:00
joshvera
ea8a01db78 Merge branch 'master' into parse-json 2015-10-17 14:36:07 -04:00
Rob Rix
84919e5b02 Test double inversion idempotency. 2015-10-16 17:46:25 -04:00
Rob Rix
6ac949fe4b Test that differences differ. 2015-10-16 17:46:12 -04:00
Rob Rix
c57d43c48b Extract diff equality. 2015-10-16 17:44:29 -04:00
Rob Rix
0ebe673aaf Inversion is less constrained. 2015-10-16 17:44:18 -04:00
Rob Rix
bec43a2c94 Test that the after state is recoverable. 2015-10-16 17:35:18 -04:00
Rob Rix
20fa9ba32a Test that the before state is recoverable. 
Apparently it is sometimes not!
 2015-10-16 17:34:34 -04:00
Rob Rix
22fe4c4ebb Patch is a Functor. 
My kingdom for DeriveFunctor.
 2015-10-16 17:31:58 -04:00
joshvera
1e156419aa remove framework search paths 2015-10-16 17:29:23 -04:00
Rob Rix
af3630e071 Test that diff equality is reflexive. 2015-10-16 17:26:35 -04:00
Rob Rix
059803788c Construct arbitrary ranged diffs. 2015-10-16 17:21:45 -04:00
Rob Rix
23db982035 Stub in RangedDiff. 2015-10-16 17:17:48 -04:00
Rob Rix
e438646045 Move UnannotatedTerm to its own file. 2015-10-16 17:16:34 -04:00
Rob Rix
ce20112304 Test that equal terms produce identity diffs. 2015-10-16 17:14:08 -04:00
Rob Rix
dee991f0ff Add an interpreter. 2015-10-16 17:13:59 -04:00
Rob Rix
0f59062570 Typealiases. 2015-10-16 17:13:51 -04:00
Rob Rix
34777ef796 Tacit. 2015-10-16 17:07:45 -04:00
Rob Rix
d18a1a6a0a Stub in diff tests. 2015-10-16 17:07:37 -04:00
Rob Rix
8759bf8322 Whatever. 2015-10-16 17:07:23 -04:00
Rob Rix
541ea6b45c Test that equality is reflexive. 2015-10-16 17:03:18 -04:00
Rob Rix
0c75c7d600 Pick a number by fiat. 2015-10-16 17:03:07 -04:00
Rob Rix
2aed2e3d51 Choose from a strictly smaller k. 2015-10-16 17:01:16 -04:00
Rob Rix
6627d40bf9 Recur through a strictly smaller k. 2015-10-16 17:00:10 -04:00
Rob Rix
03a9e74dbc Extract a function for computing arbitrary terms. 2015-10-16 16:58:46 -04:00
Rob Rix
e409a4ce56 Stub in Term tests. 2015-10-16 16:56:30 -04:00
Rob Rix
aec3c72e78 Merge branch 'cofree-memoizes' into property-testing 
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
 2015-10-16 16:52:42 -04:00
Rob Rix
3d85194f8c Merge branch 'master' into cofree-memoizes 2015-10-16 16:40:59 -04:00
Rob Rix
b4dc1e7bf1 Cofree is not lazy. 2015-10-16 16:40:47 -04:00
joshvera
94c2c5baee Merge branch 'master' into parse-json 
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
 2015-10-16 16:29:25 -04:00
Rob Rix
3fb6fcb5c9 Merge branch 'cofree-memoizes' into property-testing 2015-10-16 16:13:46 -04:00
Rob Rix
841f7017c8 Indirection. 2015-10-16 16:10:10 -04:00
Rob Rix
457c3c53f6 Merge branch 'cofree-memoizes' into property-testing 2015-10-16 16:07:29 -04:00
Rob Rix
f4e462eba2 Cofree uses Memo to ensure that statefully-computed subtrees are “ok.” 
Randomness is an effect.
 2015-10-16 16:05:37 -04:00
joshvera
295afbef6f Move JSONLeaf and JSONParser to files 2015-10-16 15:41:35 -04:00
Rob Rix
63ffe0a596 Use symbols for keys. 2015-10-16 15:22:07 -04:00
Rob Rix
e85566bfeb Use symbols for leaves. 2015-10-16 15:21:58 -04:00
Rob Rix
057a847f30 Add a generator for symbols. 
Right now just _<hex digit>
 2015-10-16 15:21:27 -04:00
Rob Rix
d413f24e57 Delay the arbitrary sub-term. 2015-10-16 15:17:47 -04:00
Rob Rix
c9bc15bcc9 Revert "Add a delay combinator." 
This reverts commit 2feeac9065de48f6e5cb412752a6a8e4d2fcf5ca.
 2015-10-16 15:17:05 -04:00
Rob Rix
0622a984dc Delay recurrence. 
Inlined because Swift.
 2015-10-16 15:17:00 -04:00
Rob Rix
989a2d7319 Add a delay combinator. 2015-10-16 15:12:08 -04:00
Rob Rix
e6ac782e84 Implement the computation of arbitrary ranged terms. 2015-10-16 15:06:27 -04:00
Rob Rix
541897aa43 Arrange unannotated terms. 2015-10-16 15:05:01 -04:00
joshvera
e7fa851420 parse arrays 2015-10-16 14:52:03 -04:00
joshvera
0628142d8b parse members 2015-10-16 14:43:23 -04:00
Rob Rix
5beccbdca2 Compute the source of unannotated terms. 2015-10-16 14:40:18 -04:00
Rob Rix
4a24c3f872 Generate arbitrary keyed terms. 2015-10-16 14:30:53 -04:00
Rob Rix
cc1f0a07a3 Rename the branch case to indexed. 2015-10-16 14:26:58 -04:00
Rob Rix
c249f1de8a Construct arbitrary unannotated branches. 2015-10-16 14:26:46 -04:00
Rob Rix
6a4e1dca39 Construct arbitrary unannotated leaves. 2015-10-16 14:26:32 -04:00
Rob Rix
412ea9cc04 Add unannotated terms. 2015-10-16 14:24:17 -04:00
Rob Rix
570d4efa5d Generate arbitrary leaves. 2015-10-16 13:23:38 -04:00
joshvera
a93e8e90da remove String.lift 2015-10-16 13:10:18 -04:00
joshvera
b6ec5e0bf8 Parse simple json 2015-10-16 13:08:49 -04:00
Rob Rix
a3ef491de4 Stub in Arbitrary conformance. 2015-10-16 12:28:49 -04:00
Rob Rix
c415a6aafd Add a RangedTerm struct wrapping ranged terms. 2015-10-16 12:28:16 -04:00
Rob Rix
889f3ffef5 Link the tests against SwiftCheck. 2015-10-16 11:48:24 -04:00
Rob Rix
fa0b04d4cd Add SwiftCheck to the workspace. 2015-10-16 11:48:18 -04:00
Rob Rix
b851fbc186 Add SwiftCheck. 2015-10-16 11:44:48 -04:00
joshvera
b16367635b remove type declarations 2015-10-16 11:14:13 -04:00
Rob Rix
01d65a4245 Patches of terms annotated with ranges can produce JSON over source strings. 2015-10-16 11:09:30 -04:00
Rob Rix
8c341fc129 Terms annotated with ranges over a string can be printed to JSON. 2015-10-16 11:09:20 -04:00
Rob Rix
c058e81183 Syntax’s JSON parameter functions do not escape. 2015-10-16 11:09:07 -04:00
joshvera
409cca5b8d ++Madness 2015-10-16 11:06:59 -04:00
joshvera
4f529028a7 Upgrade to applicative Madness branch 2015-10-16 11:05:13 -04:00
Rob Rix
73fdb644b2 Use the typealias. 2015-10-16 10:07:06 -04:00
Rob Rix
20e5d25fbf PatchType does not require construction with a Patch. 2015-10-16 09:30:25 -04:00
Rob Rix
0c786ed160 Use the PatchType init to delete. 2015-10-16 09:30:09 -04:00
Rob Rix
aa2cce5a39 Use the PatchType init to insert. 2015-10-16 09:29:56 -04:00
Rob Rix
902ce99172 Use the PatchType init to replace. 2015-10-16 09:29:43 -04:00
Rob Rix
bcdaff9c2c PatchType requires constructors for deletions. 2015-10-16 09:28:45 -04:00
Rob Rix
64cd995e41 PatchType requires constructors for deletions. 2015-10-16 09:28:37 -04:00
Rob Rix
00115e422b PatchType requires constructors for replacements. 2015-10-16 09:28:25 -04:00
Rob Rix
831eb1e521 PatchType does not require patch. 2015-10-16 09:26:13 -04:00
Rob Rix
52dc661fc9 Use Patches’ inverse directly. 2015-10-16 09:24:12 -04:00
Rob Rix
1493b2938e PatchType requires inverse. 2015-10-16 09:23:51 -04:00
Rob Rix
c1cb797c6f Use Patches’ state directly. 2015-10-16 09:23:33 -04:00
Rob Rix
9b15398f76 PatchType requires state. 2015-10-16 09:22:41 -04:00
Rob Rix
38be68d95d Rename PatchConvertible to PatchType. 2015-10-16 09:21:41 -04:00
Rob Rix
fcff1d8e9f Correct a section marker. 2015-10-16 09:20:47 -04:00
Rob Rix
b43badaf04 🔥 FreeConvertible. 2015-10-16 09:20:14 -04:00
Rob Rix
c5fe7bec46 What why 2015-10-15 18:32:43 -04:00
Rob Rix
90d84593c8 Remove Algorithm.evaluate() in all its many forms. 2015-10-15 18:30:16 -04:00
Rob Rix
bee0876bae Correct the test of categorization. 2015-10-15 18:29:23 -04:00
Rob Rix
d833e65b50 Correct the test of restrictions. 2015-10-15 18:29:17 -04:00
Rob Rix
8595464342 Migrate the tests to Interpreter. 2015-10-15 18:25:35 -04:00
Rob Rix
690e8ef175 Rename AlgorithmTests → InterpreterTests. 2015-10-15 18:18:38 -04:00
Rob Rix
5584c2f653 Use the sum combinator to compute a cost function. 2015-10-15 18:16:02 -04:00
Rob Rix
792a6b6654 Add a convenience for summing Frees. 2015-10-15 18:13:22 -04:00
joshvera
360baa236c parse some jsons 2015-10-15 17:40:57 -04:00
joshvera
9f29b877da add Madness 2015-10-15 16:20:42 -04:00
Rob Rix
7871169f8d Compute JSON diffs with Interpreter. 2015-10-15 15:50:46 -04:00
Rob Rix
5c85adaab0 Merge branch 'master' into interpreter 
Conflicts:
	prototype/Doubt/Algorithm.swift
 2015-10-15 15:45:01 -04:00
Rob Rix
1690c71cb2 Convenience constructor for Interpreters with Categorizable annotations. 2015-10-15 15:43:18 -04:00
Rob Rix
1e53b446ab Cofree conforms to CofreeType. 2015-10-15 15:42:39 -04:00
Rob Rix
522757c121 Replace CofreeConvertible with CofreeType. 2015-10-15 15:42:24 -04:00
Rob Rix
f8cd049280 Add a function from categorization functions to comparable functions. 2015-10-15 15:39:55 -04:00
Josh Vera
e6ec91cd64 Merge pull request #120 from github/patch-constructors-on-diff 
Patch constructors on diff
 2015-10-15 15:39:14 -04:00
Rob Rix
2d21447312 Replaces the convenience constructor with a diff cost constructor. 2015-10-15 15:34:59 -04:00
Rob Rix
8d93a77b86 Add a CofreeConvertible protocol. 2015-10-15 15:31:51 -04:00
Rob Rix
24c66eb1ff Convenience constructor taking a Patch cost function. 2015-10-15 15:28:21 -04:00
Rob Rix
53c78fd546 It’s a type. 2015-10-15 15:28:12 -04:00
Rob Rix
1b86134377 Difference over Patch<Term: TermType>. 2015-10-15 15:25:04 -04:00
Rob Rix
e8a67fbdb0 Sum over Patch<Term: TermType>. 2015-10-15 15:24:58 -04:00
Rob Rix
e5fe5f448a Parameterized difference over Patch. 2015-10-15 15:23:51 -04:00
Rob Rix
45d2697c46 Parameterized sum over Patch. 2015-10-15 15:23:36 -04:00
Rob Rix
856abbe611 I don’t know. 2015-10-15 15:08:06 -04:00
Rob Rix
e5f6d1acfa Add a top-down, left-to-right reduce method to Free. 2015-10-15 15:07:13 -04:00
Rob Rix
662fbe7dbc Don’t require equal when the leaf type is Equatable. 2015-10-15 14:34:47 -04:00
Rob Rix
62c13aed65 Document run. 2015-10-15 14:30:14 -04:00
Rob Rix
5aa7b7c26a Document Interpreter’s constructor. 2015-10-15 14:28:28 -04:00
Rob Rix
98398f6fd0 Move the run method to the top. 2015-10-15 14:16:01 -04:00
Rob Rix
58b8fc2fe6 Merge branch 'master' into interpreter 2015-10-15 14:15:33 -04:00
Rob Rix
b453319db4 Merge branch 'master' into restrict-comparisons-by-category 2015-10-15 14:14:34 -04:00
Rob Rix
3a4f331b2e Document the categorize parameter. 2015-10-15 14:14:29 -04:00
Rob Rix
a34b5a34f4 Document the equals parameter. 2015-10-15 14:12:39 -04:00
Rob Rix
e2e55ef041 Document the purpose of size. 2015-10-15 13:45:30 -04:00
Rob Rix
5e947ae30a Rename equals to equal. 2015-10-15 12:20:22 -04:00
Rob Rix
5c163d291b Document the Diff typealias. 2015-10-15 12:16:58 -04:00
Rob Rix
c46d48b582 Public constructor. 2015-10-15 12:16:39 -04:00
Rob Rix
02e5ed7539 Bail if a and b are not comparable. 2015-10-15 12:15:50 -04:00
Rob Rix
482aa3b907 Document recur. 2015-10-15 12:15:30 -04:00
Rob Rix
6263645728 Add a comparable parameter. 2015-10-15 12:15:27 -04:00
Rob Rix
53ea4fcf36 Interpretation of .ByIndex algorithms. 2015-10-15 11:51:01 -04:00
Rob Rix
932bc44778 Add a private cost parameter to Interpreter. 2015-10-15 11:50:43 -04:00
Rob Rix
5a6b96e38b Interpret .ByKey algorithms. 2015-10-15 11:50:04 -04:00
Rob Rix
ca3023dce3 Document the interpretation of .Recursive nodes. 2015-10-15 11:48:49 -04:00
Rob Rix
7771edccf5 .Recursive replaces. 2015-10-15 11:47:27 -04:00
Rob Rix
2dbfd51f15 Recur through pairs of .Keyed nodes with equal keys. 2015-10-15 11:45:40 -04:00
Rob Rix
52c1b581c6 Recur through pairs of equal-length indexed terms. 2015-10-15 11:33:13 -04:00
Rob Rix
8680bb4165 Infer a type. 2015-10-15 11:29:56 -04:00
Rob Rix
ac84875a4b Return pure diffs. 2015-10-15 11:29:49 -04:00
Rob Rix
0960bdacf4 Extract a method recurring over algorithms. 2015-10-15 11:29:04 -04:00
Rob Rix
7a31fe7e75 The equality parameter is private. 2015-10-15 11:27:44 -04:00
Rob Rix
3c08972026 Extract a private recurrence method. 2015-10-15 11:26:35 -04:00
Rob Rix
9a98450cfe Merge branch 'patch-constructors-on-diff' into interpreter 2015-10-15 11:23:18 -04:00
Rob Rix
0b916807a2 Use the patch constructors in recursive evaluation. 2015-10-15 11:21:23 -04:00
Rob Rix
d74e4fb231 Missed a couple of cases in SES. 2015-10-15 11:20:41 -04:00
Rob Rix
eda4ece5a8 Use the patch constructors in dictionary diffing. 2015-10-15 11:20:07 -04:00
Rob Rix
fed0d91d30 Use the patch constructors in SES. 2015-10-15 11:19:14 -04:00
Rob Rix
298a37c444 Section header for patch construction. 2015-10-15 11:18:16 -04:00
Rob Rix
6ee73cca06 We don’t need Cofree terms to construct patches. 2015-10-15 11:18:06 -04:00
Rob Rix
cd7e67c30d Remove the convenience functions. 2015-10-15 11:16:27 -04:00
Rob Rix
b4ea7b70bc Use the Diff/Patch constructors in the tests. 2015-10-15 11:16:21 -04:00
Rob Rix
9e80e0c903 Add a Delete constructor to Free when used as a diff. 2015-10-15 11:11:06 -04:00
Rob Rix
ce633f555a Add an Insert constructor to Free when used as a diff. 2015-10-15 11:10:35 -04:00
Rob Rix
8366dc752a Add a Replace constructor to Free when used as a Diff. 2015-10-15 11:10:16 -04:00
Rob Rix
787681eafc Construct an algorithm. 2015-10-15 11:07:35 -04:00
Rob Rix
98d333d721 Test equality, otherwise replace. 2015-10-15 11:04:37 -04:00
Rob Rix
6f71a42509 Running takes a pair of Terms. 2015-10-15 11:03:15 -04:00
Rob Rix
0cedf87540 Interpreter has a Diff typealias. 2015-10-15 11:01:35 -04:00
Rob Rix
a9f5075d3e Interpreter has an equality function. 2015-10-15 11:00:49 -04:00
Rob Rix
22cb1e00d5 Abstract Interpreter over a TermType. 2015-10-15 11:00:27 -04:00
Rob Rix
1a4151b2a9 Stub in running. 2015-10-15 10:58:57 -04:00
Rob Rix
28c5fb81a2 Rename B to Result. 2015-10-15 10:49:39 -04:00
Rob Rix
30e9ac9106 Stub in docs for Interpreter. 2015-10-15 10:45:32 -04:00
Rob Rix
6a955d5e88 Stub in Interpreter. 2015-10-15 10:45:11 -04:00
Rob Rix
a7192afc47 Merge branch 'patch-costs-are-proportional-to-the-size-of-their-trees' into interpreter 2015-10-15 10:42:02 -04:00
Rob Rix
dfa34aa13c Merge branch 'master' into patch-costs-are-proportional-to-the-size-of-their-trees 2015-10-15 09:48:15 -04:00
Rob Rix
260a317194 Merge branch 'master' into restrict-comparisons-by-category 
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
 2015-10-15 09:47:49 -04:00
Rob Rix
48234b71c2 Remove Hash. 2015-10-15 09:44:40 -04:00
Rob Rix
77a32f9e8d Remove Patch hashing. 2015-10-15 09:44:36 -04:00
Rob Rix
f30d2d609a Remove Syntax hashing. 2015-10-15 09:43:51 -04:00
Rob Rix
1cbc04100d Remove Free hashing. 2015-10-15 09:43:27 -04:00
Rob Rix
8b5a269d5e Remove Cofree hashing. 2015-10-15 09:43:23 -04:00
Rob Rix
9ac09dea2c Remove Category. 2015-10-15 09:40:36 -04:00
Rob Rix
6fcfed8f37 Remove Info. 2015-10-15 09:39:20 -04:00
Rob Rix
9cc446b4ea Merge branch 'master' into patch-costs-are-proportional-to-the-size-of-their-trees 
Conflicts:
	prototype/Doubt/Patch.swift
	prototype/Doubt/TermType.swift
	prototype/DoubtTests/SESTests.swift
 2015-10-15 09:32:36 -04:00
Rob Rix
f0d5e1c05d This got pulled in twice due to a cherry-pick followed by a merge. 
I didn’t know that was even possible.
 2015-10-15 09:29:26 -04:00
Rob Rix
c022085919 Merge branch 'master' into restrict-comparisons-by-category 
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
	prototype/Doubt/Fix.swift
 2015-10-15 09:28:21 -04:00
Rob Rix
59947a6581 Rename TermType.out to TermType.unwrap. 2015-10-15 09:18:55 -04:00
Rob Rix
cb5dde7bb1 Remove Fix. 2015-10-15 09:17:55 -04:00
Rob Rix
3d8027b6a1 Fix is no longer a TermType. 2015-10-15 09:17:40 -04:00
Rob Rix
3763d7354f Remove the constrained extension providing JSON from diffs when their terms are Fix<A>. 
This was not easy to reproduce with Cofree because you can’t introduce
a type variable to constrain the annotation to.
 2015-10-15 09:16:49 -04:00
Rob Rix
dd48510b65 Original terms can be recovered without annotations. 2015-10-15 09:12:34 -04:00
Rob Rix
3356a11805 Remove the redundant Free/Fix construction. 
This was handled by Free/TermType construction.
 2015-10-15 09:09:58 -04:00
Rob Rix
89720c8e65 Test SES over Cofree terms. 2015-10-15 09:08:30 -04:00
Rob Rix
adca66f66c Define parameterized equality over TermType. 2015-10-15 09:05:40 -04:00
Rob Rix
a40ae08ac5 Correct a comment. 2015-10-15 09:01:07 -04:00
Rob Rix
18d19173c0 Remove the Fix → Cofree constructor. 2015-10-15 08:58:48 -04:00
Rob Rix
70b7e56b9c Remove Doc. 2015-10-15 08:55:53 -04:00
Rob Rix
ca922b2283 Free is no longer CustomDocConvertible. 2015-10-15 08:55:26 -04:00
Rob Rix
2bfe2e2eab Fix is no longer CustomDocConvertible. 2015-10-15 08:55:01 -04:00
Rob Rix
064e5f1faa Patch is no longer CustomDocConvertible. 2015-10-15 08:54:33 -04:00
Rob Rix
eba7c9bfbd Remove DocTests.swift. 2015-10-15 08:54:04 -04:00
Rob Rix
31eb3f2b4a Syntax is no longer CustomDocConvertible. 2015-10-15 08:53:46 -04:00
Rob Rix
f55ceade22 Replace the fixtures with newer, even more exciting ones. 2015-10-14 21:10:09 -04:00
Rob Rix
b93a605b37 Document cata. 2015-10-14 21:07:30 -04:00
Rob Rix
e582f28972 Charge a constant cost for the tests. 2015-10-14 18:51:52 -04:00
Rob Rix
7c099bac6f Parameterize SES by the cost function. 2015-10-14 18:51:18 -04:00
Rob Rix
230394bde2 Charge diffs a cost proportional to their size. 
This can no longer be done in SES, as it requires knowledge that the
elements of the arrays are of TermType.
 2015-10-14 18:51:07 -04:00
Rob Rix
32c55fd5ff Add a section for PatchConvertible. 2015-10-14 18:48:15 -04:00
Rob Rix
b4a9564747 TermType has a size property. 2015-10-14 18:47:20 -04:00
Rob Rix
b0cb77ae74 Define catamorphisms over TermTypes. 2015-10-14 18:42:20 -04:00
Rob Rix
606614ffdf 🔥 Info. 2015-10-14 18:09:24 -04:00
Rob Rix
90b7ac4b21 Equals-or-intersects. 2015-10-14 18:08:56 -04:00
Rob Rix
5fccc3586c Test that uncategorized terms are unrestricted. 2015-10-14 17:51:40 -04:00
Rob Rix
c75b2c134e Correct the test of disjoint categorization to assign unique categories to each term. 2015-10-14 17:51:31 -04:00
Rob Rix
742fc0ea0f Correct the categorization test. 
This implies that uncategorized nodes can be compared with anything.
 2015-10-14 17:51:01 -04:00
Rob Rix
2aef2114c3 Test that comparisons are unrestricted by default. 2015-10-14 17:47:07 -04:00
Rob Rix
1134f7a9e9 Add a fixture for an unrestricted diff. 2015-10-14 17:46:50 -04:00
Rob Rix
90864e397b Avoid an annotation. 2015-10-14 17:46:41 -04:00
Rob Rix
0cb72943b1 Rename the test case. 2015-10-14 17:44:19 -04:00
Rob Rix
d9e7798dde Test that comparisons of disjoint-categorized terms are restricted. 2015-10-14 17:41:51 -04:00
Rob Rix
1f23ec9e47 Extract the diff into a private global. 2015-10-14 17:39:53 -04:00
Rob Rix
48a9a741c7 Merge branch 'master' into restrict-comparisons-by-category 2015-10-14 17:36:47 -04:00
joshvera
46010e3096 Merge branch 'master' into diff-cofree-values 2015-10-14 16:49:28 -04:00
Josh Vera
df31170dc8 Merge pull request #107 from github/generalize-patch 
Generalize Patch
 2015-10-14 16:47:57 -04:00
Josh Vera
d49986c671 Merge pull request #102 from github/charge-a-constant-cost-to-patches 
Charge a constant cost to patches
 2015-10-14 16:47:47 -04:00
Rob Rix
025d43379e Merge branch 'master' into diff-cofree-values 2015-10-14 16:46:07 -04:00
Rob Rix
4690ae6533 Merge branch 'master' into generalize-patch 2015-10-14 16:45:33 -04:00
Josh Vera
99c4e8556e Merge pull request #109 from github/literal-syntax-construction 
Literal syntax construction
 2015-10-14 16:44:25 -04:00
Rob Rix
7a03f09fe9 Test that comparisons are restricted by nil returns from recur. 2015-10-14 16:43:08 -04:00
Matt Diephouse
6eff8d6f82 Merge pull request #101 from github/parameterize-algorithm-evaluation-by-comparison-restriction 
Parameterize Algorithm evaluation by comparison restriction
 2015-10-14 16:42:03 -04:00
Rob Rix
e0692770b3 Cofree is CustomDebugStringConvertible. 2015-10-14 16:40:13 -04:00
Rob Rix
bf48944c83 Diff equality. 2015-10-14 16:32:01 -04:00
Rob Rix
92ec5b6130 Define parameterized equality over TermType. 2015-10-14 16:31:32 -04:00
Rob Rix
ed10ec1257 Write the fixtures using the typealias. 2015-10-14 16:10:23 -04:00
Rob Rix
35617fee70 Add typealiases for Diff and Term. 2015-10-14 16:09:58 -04:00
Rob Rix
ff559845d8 Add a couple of fixtures. 2015-10-14 16:07:07 -04:00
Rob Rix
9a6e8dea03 Merge branch 'literal-syntax-construction' into restrict-comparisons-by-category 2015-10-14 16:03:54 -04:00
Rob Rix
86df4c6a87 Syntax is DictionaryLiteralConvertible. 2015-10-14 16:03:14 -04:00
Rob Rix
76ca906097 Syntax is ArrayLiteralConvertible. 2015-10-14 16:02:33 -04:00
Rob Rix
0c78e344ad Stub in a test suite for Algorithm. 2015-10-14 15:57:58 -04:00
Rob Rix
124d45a549 Cofree has categories when B: Categorizable. 2015-10-14 15:49:23 -04:00
Rob Rix
b60abdf5b0 Factoring. 2015-10-14 15:46:19 -04:00
Rob Rix
3117d26464 Fix up the categorization. 2015-10-14 15:44:58 -04:00
Rob Rix
6d0bfdb9d0 Add an evaluate method parameterized by categorization. 2015-10-14 15:43:24 -04:00
Rob Rix
80bda88082 Merge branch 'diff-cofree-values' into restrict-comparisons-by-category 
Conflicts:
	prototype/Doubt/SES.swift
	prototype/DoubtTests/SESTests.swift
 2015-10-14 15:35:18 -04:00
Rob Rix
105b57566b Replace the JSON fixtures with much cooler JSON fixtures. 2015-10-14 14:40:47 -04:00
Rob Rix
ed004ca4c1 Annotate terms with their sizes. 2015-10-14 14:40:21 -04:00
Rob Rix
645e038982 Compute the size of syntax trees. 2015-10-14 14:32:26 -04:00
Rob Rix
6b781622b6 Add the annotations to the JSON. 2015-10-14 14:22:19 -04:00
Rob Rix
abd037796a Annotate JSON with integers. 2015-10-14 14:21:12 -04:00
Rob Rix
1fc7771918 Int is CustomJSONConvertible. 2015-10-14 14:20:58 -04:00
Rob Rix
f34af098d3 String is CustomJSONConvertible. 2015-10-14 14:20:13 -04:00
Rob Rix
29001b713c Diff JSON in Cofree. 2015-10-14 14:17:56 -04:00
Rob Rix
07690849a6 Convenience for constructing Cofree with autoclosures. 2015-10-14 14:17:29 -04:00
Rob Rix
9afc487776 Cofree is a TermType. 2015-10-14 14:05:43 -04:00
Rob Rix
714f99638e Abstract Algorithm over a Term type. 2015-10-14 14:04:47 -04:00
Rob Rix
7e9a41dfbd Make the Roll case indirect. 2015-10-14 14:04:35 -04:00
Rob Rix
b8dca6fe2a Call evaluate with equality. 2015-10-14 14:03:46 -04:00
Rob Rix
79708346e0 Correct the Diff typealias. 2015-10-14 14:00:46 -04:00
Rob Rix
3e75895c4d Fix is a TermType. 2015-10-14 13:57:21 -04:00
Rob Rix
92cb1927d1 Move Term/Diff to the top level. 2015-10-14 13:57:12 -04:00
Rob Rix
4fb38d612e Add a constructor for Free over arbitrary TermType. 2015-10-14 13:52:43 -04:00
Rob Rix
6f886356aa Add a TermType protocol. 2015-10-14 13:52:25 -04:00
Rob Rix
6188a5a2d7 Move FreeConvertible to Free.swift. 2015-10-14 13:34:29 -04:00
Rob Rix
01b32b010f Rename Algorithm’s A type parameter to Leaf. 2015-10-14 13:33:51 -04:00
Rob Rix
31d905ac64 Merge branch 'generalize-patch' into diff-cofree-values 2015-10-14 13:31:00 -04:00
Rob Rix
436708bb3b 🔥 chaff. 2015-10-14 13:16:27 -04:00
Rob Rix
09fad58fd7 Correct a comment. 2015-10-14 12:46:16 -04:00
Rob Rix
b8f8953f1c Return the identity diff when equal. 2015-10-14 12:29:40 -04:00
Rob Rix
517c87c303 Revert "Revert "SES does not take an equality test."" 
This reverts commit bb73f6eac2b59599607369767e9e221e7e5e0f15.
 2015-10-14 12:28:45 -04:00
Rob Rix
d0d96d569d Revert "Pass the correct equality function to SES." 
This reverts commit e78c6cde10ad70e93ab003ceacc07db290b061e4.
 2015-10-14 12:28:41 -04:00
Rob Rix
432c9f7239 Pass the correct equality function to SES. 2015-10-14 12:26:25 -04:00
Rob Rix
a7f4d91d56 Revert "SES does not take an equality test." 
This reverts commit 1db8bdf82c85a490188882b810cd9c516e4f210e.

Conflicts:
	prototype/Doubt/SES.swift
	prototype/DoubtTests/SESTests.swift
 2015-10-14 12:25:38 -04:00
Rob Rix
8d4a91d3a9 Merge branch 'parameterize-algorithm-evaluation-by-comparison-restriction' into generalize-patch 
Conflicts:
	prototype/Doubt/SES.swift
	prototype/DoubtTests/SESTests.swift
 2015-10-14 12:24:04 -04:00
Rob Rix
6e5335c915 SES tests operate over strings. 2015-10-14 12:19:38 -04:00
Rob Rix
0acdd16db3 Generalize SES to arbitrary arrays. 2015-10-14 12:18:49 -04:00
Rob Rix
34258b98b8 Generalize Patch from Fix<A> to A. 2015-10-14 12:17:39 -04:00
Rob Rix
e33f733d83 SES does not take an equality test. 2015-10-14 12:14:15 -04:00
Rob Rix
da11e0983a Don’t test equality in SES. 2015-10-14 12:11:03 -04:00
Rob Rix
964204a3e6 Rename the PatchConvertible associated type to Element. 2015-10-14 12:02:57 -04:00
Rob Rix
ef5720ad17 Add a typealias representing the type of patches. 2015-10-14 11:56:30 -04:00
Rob Rix
49fb97594a Move Operation’s Functor implementation to a separate extension. 2015-10-14 11:43:17 -04:00
Rob Rix
c9134b5867 Move Operation into its own file. 2015-10-14 11:40:43 -04:00
Rob Rix
ff2c904888 Abstract Operation over Term and Diff types. 2015-10-14 11:39:56 -04:00
Rob Rix
79969bb69d Move FreeConvertible into Free.swift. 2015-10-14 11:24:23 -04:00
Rob Rix
1cc879dc5d Merge branch 'master' into restrict-comparisons-by-category 2015-10-14 11:19:26 -04:00
Rob Rix
b9ac0d3c38 JSON property for cofree over CustomJSONConvertible types. 2015-10-14 11:01:41 -04:00
Rob Rix
8f86f9ab76 Parameterized JSON conversion for Cofree. 2015-10-14 10:59:41 -04:00
Rob Rix
e70cbe4235 Algebraic hashing over cofrees of Hashable types. 2015-10-14 10:57:25 -04:00
Rob Rix
db57734586 Parameterized hashing over Cofree. 2015-10-14 10:56:25 -04:00
Rob Rix
3dcfbc0d38 Equality over Cofrees of equatable types. 2015-10-14 10:53:29 -04:00
Rob Rix
889dab1df2 Parameterized equality over Cofree. 2015-10-14 10:52:27 -04:00
Rob Rix
84ea5248e3 Unroll does not need to be indirect. 2015-10-14 10:49:05 -04:00
Rob Rix
8f3ae52d29 Cofree’s recurrence is lazy. 2015-10-14 10:48:42 -04:00
Rob Rix
c8234d27a4 Document coiterate. 2015-10-14 10:44:53 -04:00
Rob Rix
c13023b85b Add a constructor annotating terms into Cofrees. 2015-10-14 10:39:21 -04:00
Rob Rix
961e9ae7d7 Implement coiteration. 2015-10-14 10:39:01 -04:00
Rob Rix
fa2bfcd367 duplicate() is just extend(id). 2015-10-14 10:24:16 -04:00
Rob Rix
5015238546 Document Cofree.document(). 2015-10-14 10:23:43 -04:00
Rob Rix
b50ebdf21a Document Cofree.extend(). 2015-10-14 10:22:04 -04:00
Rob Rix
011719b752 map’s transformation function is @noescape. 2015-10-14 10:20:21 -04:00
Rob Rix
2c56ee66ea extend’s transformation function is @noescape. 2015-10-14 10:20:05 -04:00
Rob Rix
7bff8f6f50 Document Cofree.extract. 2015-10-14 10:19:38 -04:00
Rob Rix
ab3d297d95 Document Cofree. 2015-10-14 10:19:02 -04:00
Rob Rix
6774213fcd Cofree is a Functor. 2015-10-14 10:09:38 -04:00
Rob Rix
a606d9d798 Implement duplicate on Cofree. 2015-10-14 10:03:42 -04:00
Rob Rix
1a44f29778 Cofree.extend is public. 2015-10-14 10:01:26 -04:00
Rob Rix
cc805f6610 Cofree.extract is public. 2015-10-14 10:01:19 -04:00
Rob Rix
26f0ea419d Implement extend on Cofree. 2015-10-14 10:00:16 -04:00
Rob Rix
ab554c52a0 Unwrap Cofrees. 2015-10-14 09:59:04 -04:00
Rob Rix
3985ef0fea Unroll should be indirect. 2015-10-14 09:56:46 -04:00
Rob Rix
59dd626361 Add a Syntax to Cofree. 2015-10-14 09:43:51 -04:00
Rob Rix
0d662ade08 Implement extract on Cofree. 2015-10-14 09:43:23 -04:00
Rob Rix
a83f77116d Add an Unroll case to Cofree. 2015-10-14 09:42:21 -04:00
Rob Rix
59b60947f9 Stub in Cofree. 2015-10-14 09:34:18 -04:00
Rob Rix
3238bc14bd Rename Category.swift to Categorizable.swift. 2015-10-14 09:02:38 -04:00
Rob Rix
c7ef3cc586 Remove Category. 2015-10-14 09:02:21 -04:00
Rob Rix
1f40f40869 Info just uses Strings as its categories. 2015-10-14 09:02:00 -04:00
Rob Rix
4d07ed6fe7 String is CustomJSONConvertible. 2015-10-14 09:01:41 -04:00
Rob Rix
a68ad254d5 Inheritances are in alphabetical order. 2015-10-14 08:59:56 -04:00
Rob Rix
58c0a7ff2c Categories can be of any Hashable type. 2015-10-14 08:59:19 -04:00
Rob Rix
59b7d60349 Move Term and Diff to the top level. 2015-10-13 21:45:48 -04:00
Rob Rix
7b517af351 Convenience for A: Categorizable, A: Equatable, B == Diff<A>. 2015-10-13 21:41:41 -04:00
Rob Rix
f4dda1c315 If A is Categorizable, require empty categories or non-intersecting sets of categories. 2015-10-13 21:41:20 -04:00
Rob Rix
2c3716d91c Don’t provide a default implementation of categories. 2015-10-13 21:40:12 -04:00
Rob Rix
8190064f48 Terms have categories. 2015-10-13 21:36:14 -04:00
Rob Rix
30d1a5dee2 Info is Categorizable. 2015-10-13 21:33:42 -04:00
Rob Rix
346a4e17c7 Categorizable types have categories. 2015-10-13 21:33:24 -04:00
Rob Rix
088624118b Stub in a Categorizable protocol. 2015-10-13 21:33:01 -04:00
Rob Rix
4454f4b04f Document Category, sorta. 2015-10-13 21:29:04 -04:00
Rob Rix
02c33cc006 Merge branch 'master' into charge-a-constant-cost-to-patches 2015-10-13 21:14:42 -04:00
Rob Rix
f2826c3bd2 Merge branch 'master' into parameterize-algorithm-evaluation-by-comparison-restriction 2015-10-13 21:14:30 -04:00
Rob Rix
fca262a6b2 Remove the submodule. 2015-10-13 21:10:20 -04:00
Rob Rix
1dcd2aea59 Remove the plist. 2015-10-13 21:08:37 -04:00
Rob Rix
77022447ea Remove the fixtures. 2015-10-13 21:08:29 -04:00
Rob Rix
877fa88177 Remove the scheme. 2015-10-13 21:08:13 -04:00
Rob Rix
d3cb848d87 Remove doubt-swift’s dependencies from the workspace. 2015-10-13 21:07:02 -04:00
Rob Rix
368e700c1a Remove doubt-swift from the project. 2015-10-13 21:06:40 -04:00
Rob Rix
9b66e550f3 Delete the doubt-swift target. 2015-10-13 21:06:21 -04:00
Rob Rix
24bf8f4497 Merge branch 'parameterize-algorithm-evaluation-by-comparison-restriction' into charge-a-constant-cost-to-patches 2015-10-13 18:35:43 -04:00
Rob Rix
7b37db6943 Replace the UI fixture. 2015-10-13 18:27:12 -04:00
Rob Rix
7786b8c40f Remove the Patch.cost property. 2015-10-13 18:20:11 -04:00
Rob Rix
ee0f8765aa Charge a constant cost to Patches. 2015-10-13 18:19:56 -04:00
Rob Rix
4ea9aab8b2 Simplify control flow around recur/replace. 2015-10-13 18:14:20 -04:00
Rob Rix
a15687dca3 Correct a test fixture. 
I am unbelievably glad to be rid of this.
 2015-10-13 18:05:28 -04:00
Rob Rix
5f395c55cf Disallow diagonal edges. 
This technically still allows (in fact, requires) them for equal
elements, but it will never construct `Patch.Replace`.
 2015-10-13 18:05:11 -04:00
Rob Rix
5771d7caf5 Merge branch 'master' into parameterize-algorithm-evaluation-by-comparison-restriction 2015-10-13 17:55:52 -04:00
Rob Rix
92cb10379f Document the decision a little further. 2015-10-13 17:55:47 -04:00
Rob Rix
9f498f1099 Formatting. 2015-10-13 17:55:02 -04:00
Rob Rix
10122d62da Abbreviate the selection of the best outgoing edge. 2015-10-13 17:53:04 -04:00
Rob Rix
6cbe0a18d3 Extract diagonal. 2015-10-13 17:51:03 -04:00
Rob Rix
32bfdc6766 Factor out right/down. 2015-10-13 17:50:22 -04:00
Rob Rix
e09d46d109 nil responses restrict the traversal of diagonal edges. 2015-10-13 17:45:22 -04:00
Rob Rix
90b22cf9a8 Allow recurrence to opt out of comparing nodes by returning nil. 2015-10-13 17:40:14 -04:00
Rob Rix
873a8e668f Add a function to construct the replacement of one term by another. 2015-10-13 17:38:36 -04:00
Josh Vera
3211714bb2 Merge pull request #98 from github/side-by-side-diffs 
Side by side diffs
 2015-10-13 16:41:39 -04:00
Rob Rix
c455b59cbb Note Xcode 7 requirement. 2015-10-13 16:34:03 -04:00
Rob Rix
7825e83ed2 Add a readme for the prototype. 2015-10-13 16:33:39 -04:00
Rob Rix
b9d96134ea Merge branch 'master' into side-by-side-diffs 2015-10-13 13:18:05 -04:00
Rob Rix
f1bb19be12 Grey backgrounds for replacements. 2015-10-13 13:17:18 -04:00
Josh Vera
bd4f1e7fc1 Merge pull request #83 from github/recur-into-keyed-terms-with-equal-keys 
Recur into Keyed terms with equal keys
 2015-10-13 13:16:56 -04:00
joshvera
d2d2412260 Merge branch 'master' into recur-into-indexed-terms-of-equal-length 2015-10-13 13:03:13 -04:00
Matt Diephouse
692bb05a4e Merge pull request #96 from github/generalize-array-extension 
Generalize array extension
 2015-10-13 12:48:20 -04:00
Rob Rix
c0ab5abd9f Drop the outline from replacements. 2015-10-13 12:44:25 -04:00
Rob Rix
fad02bab81 Give replacements a background colour. 2015-10-13 11:47:07 -04:00
Rob Rix
4ed33b485a Background colours for insertions/deletions. 2015-10-13 11:43:25 -04:00
Rob Rix
2a671d5403 Change up the outline colours. 2015-10-13 11:43:17 -04:00
Rob Rix
67a19682e8 HIghlight replacements. 2015-10-13 11:25:20 -04:00
Rob Rix
7aab1da72c Shift things to either side. 2015-10-13 11:24:55 -04:00
Rob Rix
dd05a2d5ee Skip empty branches. 2015-10-13 11:24:08 -04:00
Rob Rix
91093f1aac Only wrap elements that exist. 2015-10-13 11:22:56 -04:00
Rob Rix
ec9c29e29d Only add children that exist. 2015-10-13 11:22:34 -04:00
Rob Rix
b10f4e2507 Don’t float things. 2015-10-13 11:20:54 -04:00
Rob Rix
b5f8516ab7 Leaves are wrapped in paragraphs. 2015-10-13 11:16:52 -04:00
Rob Rix
6a9e71fcd5 Arrays wrap their children in <li> elements. 2015-10-13 11:15:33 -04:00
Rob Rix
69568fb622 Arrays add <ol> elements. 2015-10-13 11:15:23 -04:00
Rob Rix
208238ae6e Add a function to wrap a node in another node. 2015-10-13 11:10:54 -04:00
Rob Rix
0dcecb9a00 Rename the DOM variable. 2015-10-13 11:09:30 -04:00
Rob Rix
f236cc9a52 Remove the left/right elements. 2015-10-13 11:08:12 -04:00
Rob Rix
90d3bee821 Disallow floating past other elements. 2015-10-13 11:07:55 -04:00
Rob Rix
27b5007eff Style insertions/deletions a little. 2015-10-13 11:07:40 -04:00
Rob Rix
205449e197 Insert the diffs into a #diff element. 2015-10-13 11:05:13 -04:00
Rob Rix
d653790ee3 Add diffs to the body. 2015-10-13 11:04:21 -04:00
Rob Rix
6050677c3d Ignore other keys, apparently. 2015-10-13 11:03:37 -04:00
Rob Rix
b8c5789786 Add before/after states. 2015-10-13 11:03:27 -04:00
Rob Rix
5d864a7f3d Add replacements to the DOM. 2015-10-13 11:01:32 -04:00
Rob Rix
984858bb9c Careful with your null checks, there. 2015-10-13 11:00:38 -04:00
Rob Rix
82918f0f4b Add deletions. 2015-10-13 11:00:29 -04:00
Rob Rix
c7cc290f1d Add insertions. 2015-10-13 10:59:45 -04:00
Rob Rix
549f482ebe yes, she knows it’s a multipass 2015-10-13 10:57:24 -04:00
Rob Rix
cf64fbb7c7 Prefix categories. 2015-10-13 10:57:07 -04:00
Rob Rix
724e875a8e Add categories. 2015-10-13 10:57:01 -04:00
Rob Rix
fff6bcf2fe Add nodes’ text content. 2015-10-13 10:56:34 -04:00
Rob Rix
869322c69b Tweak the fixture format. 2015-10-13 10:43:31 -04:00
Rob Rix
c5f2832663 Insert elements into the DOM. 2015-10-13 10:25:51 -04:00
Rob Rix
e9e6fe859e Recur through arrays. 2015-10-13 10:25:35 -04:00
Rob Rix
0f3bc75982 Construct and return a div. 2015-10-13 10:17:17 -04:00
Rob Rix
b3c4daf904 Semicolons. 2015-10-13 10:16:54 -04:00
Rob Rix
80c0443820 Abbreviate the JSON for Info. 2015-10-13 09:49:56 -04:00
Rob Rix
26aabe9c58 Call the faux sum type thing. 2015-10-13 09:47:52 -04:00
Rob Rix
161b0b86e5 Add a function doing faux sum typing on JSON. 2015-10-13 09:47:47 -04:00
Rob Rix
afda174752 Rename the file. 2015-10-13 01:02:05 -04:00
Rob Rix
7fedcb2331 Generalize the Array extension to RangeReplaceableCollectionType. 2015-10-13 01:01:32 -04:00
Rob Rix
a45e286594 🔥 String.swift. 
Unused.
 2015-10-13 00:58:35 -04:00
Rob Rix
c72a5e2e85 Rename Prelude.swift to Optional.swift. 2015-10-13 00:56:27 -04:00
Rob Rix
27126cabf7 Use Prelude’s function composition operator. 2015-10-13 00:56:13 -04:00
Rob Rix
58bdd153cb I think fix was just unused. 2015-10-13 00:55:49 -04:00
Rob Rix
4580dfae7f Use Prelude’s const. 2015-10-13 00:55:30 -04:00
Rob Rix
d32ac4c789 Use Prelude’s id. 2015-10-13 00:55:20 -04:00
Rob Rix
94182aac35 Everything links against the dependencies. 2015-10-13 00:53:54 -04:00
Rob Rix
0691637f66 Bump Stream to fix a runtime deadlock. 2015-10-13 00:52:41 -04:00
Rob Rix
5bf82fd366 🔥 Memo and Stream. 2015-10-13 00:51:43 -04:00
Rob Rix
cc7538bd40 Link against the dependencies. 2015-10-13 00:50:15 -04:00
Rob Rix
c9794d6c08 Add the other dependencies to the workspace. 2015-10-13 00:45:53 -04:00
Rob Rix
b06b241848 Bump Stream. 2015-10-13 00:45:45 -04:00
Rob Rix
2aa47c80b7 Add Stream to the workspace. 2015-10-13 00:43:33 -04:00
Rob Rix
d96c2b1629 Bump Stream. 2015-10-13 00:43:28 -04:00
Rob Rix
bacd52dda7 Include Stream. 2015-10-13 00:20:33 -04:00
Rob Rix
dd0e21866c Move doubt-swift’s dependencies into its group. 2015-10-13 00:19:56 -04:00
Rob Rix
d2be94c409 🔥 most of the custom operators. 2015-10-13 00:06:15 -04:00
Rob Rix
46df3daa08 🔥 Parse.swift. 2015-10-13 00:05:16 -04:00
Rob Rix
48ce6b7a7f Recur into Keyed nodes with equal keys. 2015-10-09 20:38:48 -04:00
Rob Rix
83b95a0e5d Correct the comment. 2015-10-09 20:24:42 -04:00
Rob Rix
d0ee908d54 Recur into indexed terms of equal length. 2015-10-09 20:24:39 -04:00
Rob Rix
962e3fda24 Switch over a/b’s syntaxes. 2015-10-09 20:24:30 -04:00
Rob Rix
9e7b8275b9 Rearrange the decisions in .Recursive evaluation. 2015-10-09 20:22:38 -04:00
Rob Rix
b1cc34bf2b doubt-json uses the construction conveniences. 2015-10-09 18:09:38 -04:00
Rob Rix
74e3caa9ce doubt-swift uses the construction conveniences. 2015-10-09 18:09:32 -04:00
Rob Rix
290ff8853c SESTests uses the constructor conveniences. 2015-10-09 18:09:15 -04:00
Rob Rix
67d861839f SyntaxConvertible extension methods are public. 2015-10-09 18:07:31 -04:00
Rob Rix
3cf5ce3b43 Construct Fix directly in discardNullTerms. 2015-10-09 18:05:50 -04:00
Rob Rix
da8d51e9ee Free is SyntaxConvertible. 2015-10-09 18:04:29 -04:00
Rob Rix
13eff7f9df Fix is SyntaxConvertible. 2015-10-09 18:03:23 -04:00
Rob Rix
30d594b4a3 SyntaxConvertible types can be constructed with shorthands. 2015-10-09 18:02:25 -04:00
Rob Rix
cdc1fbb99a Add a protocol for Syntax wrapper construction. 2015-10-09 18:02:11 -04:00
Rob Rix
fed06df766 Replace the JSON with a more compact representation. 2015-10-09 14:31:58 -05:00
Rob Rix
d33703fd00 Flatten the Free representation. 2015-10-09 14:31:10 -05:00
Rob Rix
396624e9e4 Revert "Wrap Fix.JSON in a dictionary." 
This reverts commit dbb75aa6beace787d411dab7392e75bc37ac14c2.
 2015-10-09 14:29:30 -05:00
Rob Rix
f8f055907f Add left/right divs. 2015-10-09 14:27:44 -05:00