1
1
mirror of https://github.com/github/semantic.git synced 2024-12-27 17:05:33 +03:00
Commit Graph

57 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
a19628c290 Write JSON for the diff to the passed path. 2015-10-20 17:46:07 -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
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
Rob Rix
f1e1541d8b Diff and serialize JSON strings. 2015-10-19 15:15:38 -04:00
joshvera
94c2c5baee Merge branch 'master' into parse-json
Conflicts:
	prototype/Doubt.xcodeproj/project.pbxproj
2015-10-16 16:29:25 -04:00
joshvera
295afbef6f Move JSONLeaf and JSONParser to files 2015-10-16 15:41:35 -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
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
joshvera
b16367635b remove type declarations 2015-10-16 11:14:13 -04:00
joshvera
4f529028a7 Upgrade to applicative Madness branch 2015-10-16 11:05:13 -04:00
Rob Rix
5584c2f653 Use the sum combinator to compute a cost function. 2015-10-15 18:16:02 -04:00
joshvera
360baa236c parse some jsons 2015-10-15 17:40:57 -04:00
Rob Rix
7871169f8d Compute JSON diffs with Interpreter. 2015-10-15 15:50:46 -04:00
Rob Rix
b453319db4 Merge branch 'master' into restrict-comparisons-by-category 2015-10-15 14:14:34 -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
f55ceade22 Replace the fixtures with newer, even more exciting ones. 2015-10-14 21:10:09 -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
29001b713c Diff JSON in Cofree. 2015-10-14 14:17:56 -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
92cb1927d1 Move Term/Diff to the top level. 2015-10-14 13:57:12 -04:00
Rob Rix
a68ad254d5 Inheritances are in alphabetical order. 2015-10-14 08:59:56 -04:00
Rob Rix
59b7d60349 Move Term and Diff to the top level. 2015-10-13 21:45:48 -04:00
Rob Rix
b1cc34bf2b doubt-json uses the construction conveniences. 2015-10-09 18:09:38 -04:00
Rob Rix
7c6481ef47 Print JSON diffs as JSON. 2015-10-09 09:20:46 -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
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