1599 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Josh Vera	1a28c5bae9	Merge pull request #126 from github/property-testing ... Property testing	2015-10-19 15:07:58 -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