1
1
mirror of https://github.com/github/semantic.git synced 2024-12-24 15:35:14 +03:00
Commit Graph

850 Commits

Author SHA1 Message Date
Rob Rix
57ed8641ab Merge branch 'syntax-construction' into recur-into-indexed-terms-of-equal-length 2015-10-10 10:13:59 -04:00
Rob Rix
27f2d6ec37 Merge branch 'master' into syntax-construction 2015-10-10 10:11:40 -04:00
Josh Vera
33ffa61ab7 Merge pull request #77 from github/json-diff
Produce JSON from Diffs
2015-10-09 23:03:09 -04:00
Rob Rix
48ce6b7a7f Recur into Keyed nodes with equal keys. 2015-10-09 20:38:48 -04:00
Rob Rix
4a38090f4a Merge branch 'master' into recur-into-indexed-terms-of-equal-length 2015-10-09 20:26:02 -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
joshvera
78cff984b2 Merge branch 'master' into json-diff 2015-10-09 19:42:25 -04:00
Josh Vera
192368bef7 Merge pull request #75 from github/diff-json
Diff JSON
2015-10-09 19:41:35 -04:00
Rob Rix
cb75305a4f Merge branch 'master' into syntax-construction 2015-10-09 18:16:59 -04:00
Rob Rix
926b99d2ea Merge branch 'master' into diff-json 2015-10-09 18:15:45 -04:00
Rob Rix
dc2ac6f6ba Merge branch 'master' into diff-json 2015-10-09 18:15:29 -04:00
Rob Rix
11ff521fe3 Merge pull request #74 from github/printier-pretter
Prettier printer
2015-10-09 18:14:37 -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
joshvera
46425f0194 Merge branch 'master' into printier-pretter 2015-10-09 14:19:49 -04:00
Josh Vera
6bfd2216d1 Merge pull request #71 from github/module-map
Module map
2015-10-09 14:18:18 -04:00
Josh Vera
ba5b08746e Merge pull request #70 from github/inversion
Inversion
2015-10-09 14:18:03 -04:00
Rob Rix
aad1db9da7 Merge pull request #67 from github/recover-before-and-after-states
Recover before and after states
2015-10-09 13:17:21 -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
81a80ffea0 Merge branch 'diff-json' into json-diff 2015-10-09 08:53:42 -05:00
Rob Rix
13d3d415ad Merge branch 'printier-pretter' into diff-json 2015-10-09 08:53:26 -05:00