github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-27 00:44:57 +03:00
Code Issues Projects Releases Wiki Activity
716 Commits 19 Branches 16 Tags 46 MiB
bfffe03d81
Commit Graph

653 Commits

Author SHA1 Message Date
Rob Rix
04cc6607f3 Add JSONConvertible. 2015-10-08 07:10:13 -04:00
Rob Rix
0f09ea2201 The tests do not depend on SourceKitten. 2015-10-08 07:06:46 -04:00
Rob Rix
488d214503 JSON is Equatable. 2015-10-08 07:06:16 -04:00
Rob Rix
b182f9cd41 Share the doubt-json scheme. 2015-10-07 20:08:56 -04:00
Rob Rix
c2f847ba34 Add fixtures for doubt-json. 2015-10-07 20:08:44 -04:00
Rob Rix
97e8f1725f JSONLeaf is CustomStringConvertible. 2015-10-07 20:08:34 -04:00
Rob Rix
f1cbb6d642 Compute the diff between two JSON files. 2015-10-07 19:43:22 -04:00
Rob Rix
551fb2b03d JSONLeaf is Equatable. 2015-10-07 19:43:00 -04:00
Rob Rix
a41c620b0c Merge branch 'shortest-edit-script-in-algorithm' into diff-json 
Conflicts:
	prototype/Doubt/Algorithm.swift
	prototype/Doubt/Category.swift
 2015-10-07 19:41:14 -04:00
Rob Rix
c60ce4052c Compute the term for a given JSON node. 2015-10-07 19:38:24 -04:00
Rob Rix
7953cbed82 Spacing. 2015-10-07 19:36:58 -04:00
Rob Rix
eb62a4e08f Dictionary.init(elements:) is public. 2015-10-07 19:36:53 -04:00
Rob Rix
16a933af86 Term typealias. 2015-10-07 19:36:43 -04:00
Rob Rix
6efa8249cd Extension to construct JSON with a path. 2015-10-07 19:32:02 -04:00
Rob Rix
ea8a4ee360 Link Doubt explicitly. 
Otherwise dependencies don’t get rebuilt.
 2015-10-07 19:27:17 -04:00
Rob Rix
9c98bc187a BoundsCheckedArray.init is public. 2015-10-07 19:26:35 -04:00
Rob Rix
55a54be79f Add a JSONLeaf type. 2015-10-07 19:21:26 -04:00
Rob Rix
e26062e107 Stub in a doubt-json target. 2015-10-07 19:20:40 -04:00
Rob Rix
a474ad26c3 Move BoundsCheckedArray into the framework. 2015-10-07 19:18:59 -04:00
Rob Rix
63edfe863f Empty brackets are empty. 2015-10-07 17:47:45 -04:00
Rob Rix
3787f735fb Don’t add spaces after separators. 2015-10-07 17:42:43 -04:00
Rob Rix
8d7968eb14 Pretty-print the resulting diff. 2015-10-07 17:37:20 -04:00
Rob Rix
f9de814a35 No need to compute layouts we’re not going to use. 2015-10-07 17:36:59 -04:00
Rob Rix
420dd640b8 joinWithSeparator can introduce newlines. 2015-10-07 17:31:07 -04:00
Rob Rix
15c93699d2 Flattening distributes through nesting. 2015-10-07 17:25:37 -04:00
Rob Rix
b8c17d62c1 Fix a find/replace error. 2015-10-07 17:25:15 -04:00
Rob Rix
3b8b10a4a2 Test that empty docs have empty layout. 2015-10-07 17:22:53 -04:00
Rob Rix
1d8ceac332 Doc is CustomDebugStringConvertible. 2015-10-07 17:20:20 -04:00
Rob Rix
14a2d9bc1c Patch is CustomDocConvertible. 2015-10-07 17:20:13 -04:00
Rob Rix
2a8e017282 Free is CustomDocConvertible. 2015-10-07 17:20:09 -04:00
Rob Rix
804e831705 🔥 SwiftTests. 
This was not really testing anything anyway.
 2015-10-07 17:20:02 -04:00
Rob Rix
37e204a1e3 Fix is CustomDocConvertible. 
It simply defers it to Syntax.
 2015-10-07 17:19:56 -04:00
Rob Rix
519b8477fd Diffing by key handles equal terms correctly. 2015-10-07 17:19:50 -04:00
Rob Rix
0ad285fb26 Document the Recursive operation a little. 2015-10-07 13:28:16 -04:00
Rob Rix
06c456f1cd Document dictionary diffing as an approach stemming from set reconciliation. 2015-10-07 13:25:02 -04:00
Rob Rix
21ac5822a0 Sort categories alphabetically. 2015-10-07 13:20:41 -04:00
Rob Rix
f8b89bd93b Category is Comparable. 2015-10-07 13:20:22 -04:00
Rob Rix
aef4c32754 Don’t bother destructuring tags. 2015-10-07 13:20:09 -04:00
Rob Rix
ba650f8080 Handle the zero-category case with a where clause. 2015-10-07 13:19:49 -04:00
Rob Rix
4bcc773fc6 🔥 chaff. 2015-10-07 13:13:51 -04:00
Rob Rix
c2b00c2230 Nominate the best interior edge using compare-parametric min. 2015-10-07 13:13:32 -04:00
Rob Rix
47dec5546d Restore the compare-parametric min function. 2015-10-07 13:09:22 -04:00
Rob Rix
10ddaab0ed Use values instead of mapping. 2015-10-07 13:04:03 -04:00
Rob Rix
ecef6f8370 Rename FreeAlgorithm to Algorithm. 2015-10-07 13:00:54 -04:00
Rob Rix
b8b5a26b46 Update doc comments. 2015-10-07 13:00:17 -04:00
Rob Rix
fa7a89c247 Rename Algorithm to Operation. 2015-10-07 12:59:22 -04:00
Rob Rix
1d7286a6a2 Reference the module map in the build settings. 2015-10-07 08:52:32 -04:00
Rob Rix
a8e38b1aa9 Add a module map. 2015-10-07 08:52:26 -04:00
Rob Rix
0b920df272 Diffing by key handles equal terms correctly. 2015-10-07 08:47:37 -04:00
Rob Rix
7852d8a515 Diffs have an inverse. 2015-10-07 08:43:30 -04:00
Rob Rix
0af93b4c68 Patches have an inverse. 2015-10-07 08:41:54 -04:00
Rob Rix
8a9f74a0ff Use discardNullTerms to compute both states. 2015-10-06 21:39:11 -04:00
Rob Rix
321622d553 Extract the discarding of null terms into a private helper function. 2015-10-06 21:38:44 -04:00
Rob Rix
e1dd859db9 Implicit parameters. 2015-10-06 21:36:22 -04:00
Rob Rix
ee969a75fa Compute the after state of diffs. 2015-10-06 21:35:47 -04:00
Rob Rix
b04d71ede3 Compute the before-state of diffs. 
This is `Optional`, as some diffs have unrecoverable before states. For
example, the insertion of a term has no before state, but can still
produce a valid before state if it occurs within the context of an
`Indexed` or `Keyed` node.

However, certain malformed diffs (such as `.Pure(.Insert(…))` in
isolation) may lack a valid before state, and thus the public API has
to reflect this.
 2015-10-06 21:35:19 -04:00
Rob Rix
75aaebe834 Free has a Term typealias when appropriate. 2015-10-06 21:32:38 -04:00
Rob Rix
85ac68d232 Document why PatchConvertible. 2015-10-06 21:25:21 -04:00
Rob Rix
6b3c66d801 Patch is trivially PatchConvertible. 2015-10-06 21:24:43 -04:00
Rob Rix
46f3f9431b Add a PatchConvertible protocol to enable constrained extensions. 2015-10-06 21:24:01 -04:00
Rob Rix
eec173c560 Pass fixtures to the tool. 2015-10-06 21:17:17 -04:00
Rob Rix
6f7552bae0 Add a couple of fixtures. 2015-10-06 21:17:09 -04:00
Rob Rix
e736116211 Evaluate the algorithm. 2015-10-06 21:02:00 -04:00
Rob Rix
2b9993c5f4 Treat protocols as groups. 2015-10-06 21:01:53 -04:00
Rob Rix
38c50d4e4a Term is not a proper noun any more. 2015-10-06 20:53:35 -04:00
Rob Rix
e152d8702a /dev/null -> nil 
`git difftool` will invoke us with /dev/null when a file has been
deleted.
 2015-10-06 20:48:53 -04:00
Rob Rix
b3324a6c5f Drop null JSON. 2015-10-06 20:46:24 -04:00
Rob Rix
7e4ca06cbc Indexed, not Branch. 2015-10-06 20:45:50 -04:00
Rob Rix
706654552f In, not Roll. 2015-10-06 20:45:37 -04:00
Rob Rix
771f03f1fa Indentation. 2015-10-06 20:43:27 -04:00
Rob Rix
8a6a39f06a Construct terms for section headings. 2015-10-06 20:43:23 -04:00
Rob Rix
87d547a670 Wrap constructors in .In. 2015-10-06 20:43:02 -04:00
Rob Rix
40ecf24c9e Fix, not Term. 2015-10-06 20:39:57 -04:00
Rob Rix
f131f40752 Construct the terms in Fix. 2015-10-06 20:39:51 -04:00
Rob Rix
ee151d0edc Compute the diff in FreeAlgorithm. 2015-10-06 20:39:37 -04:00
Rob Rix
c7d9216433 Info is StringConvertible. 2015-10-06 20:38:00 -04:00
Rob Rix
c16a8b3af2 Combine the extensions. 2015-10-06 20:35:52 -04:00
Rob Rix
1059a00db0 🔥 AnyEquatable. 2015-10-06 19:20:16 -04:00
Rob Rix
939a714807 🔥 AnyHashable. 2015-10-06 19:20:06 -04:00
Rob Rix
fb41713906 Replace roll() with Diff(). 2015-10-06 17:48:17 -04:00
Rob Rix
47dd0b4849 Construct with Diff(), not copy(). 2015-10-06 17:47:10 -04:00
Rob Rix
c9d51049df Construct with Diff(), not copy(). 2015-10-06 17:47:04 -04:00
Rob Rix
de61021d32 Once more, call it Term. 2015-10-06 17:46:37 -04:00
Rob Rix
f51f6f39a2 Call it Term. 2015-10-06 17:46:02 -04:00
Rob Rix
22773917a3 Construct Free with Fix. 2015-10-06 17:45:24 -04:00
Rob Rix
d097f14fcb Explain SES implementation details a little. 2015-10-06 17:36:49 -04:00
Rob Rix
6030731cc8 Extend the graph and return Stream.Nil at the end. 2015-10-06 17:36:41 -04:00
Rob Rix
57fb8ff251 Document the purpose of the matrix. 2015-10-06 17:29:33 -04:00
Rob Rix
833d27c54a Test an insertion at the end. 2015-10-06 17:29:06 -04:00
Rob Rix
6e799e0b79 Test a deletion at the end. 2015-10-06 17:28:25 -04:00
Rob Rix
d7db7415dc Patches have different costs. 2015-10-06 17:08:22 -04:00
Rob Rix
4fdbcf948f Patches have a cost. 
This charges `Replace` patches at a higher cost than `Insert`/`Delete`
patches to avoid spurious replacements.
 2015-10-06 17:07:16 -04:00
Rob Rix
bcc3da35f9 Recur at the corner. 
This can’t be right.
 2015-10-06 17:01:27 -04:00
Rob Rix
c7aad22838 Insert/delete/recur based on the edge being followed. 2015-10-06 17:01:17 -04:00
Rob Rix
c2d4c96d62 Recurrence checks for equality. 2015-10-06 16:59:29 -04:00
Rob Rix
a1a832012e Implement a function copying terms into diffs. 2015-10-06 16:59:11 -04:00
Rob Rix
a628177722 Move SES to its own file. 2015-10-06 16:50:23 -04:00
Rob Rix
8e0cafbac4 Info’s debug description uses its categories’ debug descriptions. 2015-10-06 16:49:14 -04:00
Rob Rix
606d721dea Category is CustomDebugStringConvertible. 2015-10-06 16:48:44 -04:00
Rob Rix
ee8794fd81 Patch is CustomDebugStringConvertible. 2015-10-06 16:45:36 -04:00