1
1
mirror of https://github.com/github/semantic.git synced 2024-12-21 05:41:54 +03:00
Commit Graph

860 Commits

Author SHA1 Message Date
Rob Rix
4454f4b04f Document Category, sorta. 2015-10-13 21:29:04 -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
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
Rob Rix
5a1059832c Space. 2015-10-09 13:36:38 -05:00
Rob Rix
83e228f1aa Parse the response text. 2015-10-09 13:36:18 -05:00
Rob Rix
bfffe03d81 Add a simple scaffold web page loading the doubt-swift JSON output fixture. 2015-10-09 13:31:06 -05:00
Rob Rix
8aa31288e5 Add a fixture with JSON output from doubt-swift. 2015-10-09 13:30:40 -05:00
Rob Rix
e2ae3dc533 Print Swift diffs as JSON. 2015-10-09 09:21:42 -05:00
Rob Rix
7c6481ef47 Print JSON diffs as JSON. 2015-10-09 09:20:46 -05:00
Rob Rix
e045a9063f Serialization of JSON to NSData. 2015-10-09 09:18:05 -05:00
Rob Rix
07279ca344 JSON can be converted back to an object. 2015-10-09 09:17:57 -05:00
Rob Rix
23133fe3e8 JSONLeaf is CustomJSONConvertible. 2015-10-09 09:14:07 -05:00
Rob Rix
56ef476f70 JSONLeaf has a section header for CustomStringConvertible. 2015-10-09 09:13:09 -05:00
Rob Rix
a9dcb801f2 Free has a JSON property when A is CustomJSONConvertible and B is Patch<A>. 2015-10-09 09:11:48 -05:00
Rob Rix
b422f7d9e4 Free has a unary JSON method when A is CustomJSONConvertible. 2015-10-09 09:08:35 -05:00
Rob Rix
86c92e143a Fix has a JSON property when A is CustomJSONConvertible. 2015-10-09 09:07:00 -05:00
Rob Rix
5fc16e86f8 Patch has a JSON property when A is CustomJSONConvertible. 2015-10-09 09:06:06 -05:00
Rob Rix
4512b6f2e7 Scope the JSON constructor correctly. 2015-10-09 09:02:31 -05:00
Rob Rix
05e1b97c90 I’m very confused as to how this has remained broken. 2015-10-09 09:02:02 -05:00
Rob Rix
bf7838170e Wrap Fix.JSON in a dictionary. 2015-10-09 08:45:23 -04:00
Rob Rix
bf4abc5eaa Infer the scope in Syntax.JSON. 2015-10-09 08:44:16 -04:00
Rob Rix
ea29b2846a Construct Patch.JSON using dictionary literals. 2015-10-09 08:43:57 -04:00
Rob Rix
ce1ef77f49 Construct Info.JSON using dictionary literals. 2015-10-09 08:43:43 -04:00
Rob Rix
ed9dfd2f34 Construct Free.JSON using dictionary literals. 2015-10-09 08:43:32 -04:00
Rob Rix
be8a93363a Construct Category.JSON using a dictionary literal. 2015-10-09 08:43:22 -04:00
Rob Rix
4b2fea5d13 Change Patch’s JSON heading. 2015-10-09 08:41:08 -04:00
Rob Rix
ef01e25d47 Change Syntax’s JSON heading. 2015-10-09 08:40:57 -04:00
Rob Rix
3e47d529cc Change Free’s JSON heading. 2015-10-09 08:39:57 -04:00
Rob Rix
02dc992476 Change Fix’s JSON heading. 2015-10-09 08:39:44 -04:00
Rob Rix
0cb6b01c9c JSON is NilLiteralConvertible. 2015-10-09 08:38:26 -04:00
Rob Rix
669ebed71c JSON is DictionaryLiteralConvertible. 2015-10-09 08:37:48 -04:00
Rob Rix
82e5c00e6a JSON is ArrayLiteralConvertible. 2015-10-09 08:36:46 -04:00
Rob Rix
3fac63ddc9 JSON is StringLiteralConvertible. 2015-10-09 08:35:47 -04:00
Rob Rix
c6b233b2bb JSON is BooleanLiteralConvertible. 2015-10-09 08:34:54 -04:00
Rob Rix
d0e7e41553 JSON is FloatLiteralConvertible. 2015-10-09 08:34:11 -04:00
Rob Rix
97e0e8accd JSON is IntegerLiteralConvertible. 2015-10-09 08:33:24 -04:00
Rob Rix
64ad2dc854 Section mark for Category hashing. 2015-10-09 08:31:23 -04:00
Rob Rix
b6f6042e10 Section mark for Category comparisons. 2015-10-09 08:31:10 -04:00
Rob Rix
9e51c130c4 Section mark for Category equality. 2015-10-09 08:31:04 -04:00
Rob Rix
4117b3c710 Info is CustomJSONConvertible. 2015-10-09 08:30:33 -04:00
Rob Rix
327249cb94 Category is CustomJSONConvertible. 2015-10-09 08:30:21 -04:00
Rob Rix
bb8b968994 Add a CustomJSONConvertible protocol. 2015-10-09 08:28:08 -04:00
Rob Rix
e739fcd2a5 Move JSONConvertible into JSON.swift. 2015-10-09 08:27:12 -04:00
Rob Rix
a917331f35 Section mark for Info’s CustomDebugStringConvertible implementation. 2015-10-09 08:25:26 -04:00
Rob Rix
41a3b53542 Section mark for Info’s AlgebraicHashable implementation. 2015-10-09 08:25:16 -04:00
Rob Rix
5b1b358d42 Section header for Info equality. 2015-10-09 08:21:45 -04:00
Rob Rix
341e18e84d Patch encodes its cases inline. 2015-10-08 07:31:43 -04:00
Rob Rix
0ebed9599b Free.Roll encodes its case explicitly. 2015-10-08 07:30:34 -04:00