1349 Commits

Author	SHA1	Message	Date
Rob Rix	7dae6e027e	Assign text content to the term.	2015-10-21 17:10:40 -04:00
Rob Rix	2666290cd4	Add classes to both halves of replacements.	2015-10-21 17:04:35 -04:00
Rob Rix	954c6f739f	Don’t add margins.	2015-10-21 17:02:56 -04:00
Rob Rix	b6ac8a87ee	Assign text content out to the DOM node.	2015-10-21 17:00:11 -04:00
Rob Rix	23fbde27a2	It’s not that kind of range.	2015-10-21 16:59:38 -04:00
Rob Rix	34951a109d	Don’t log the top-level diff.	2015-10-21 16:57:34 -04:00
Rob Rix	13737b7fe7	Assign text content onto the leaf itself. ... This reverts commit aad05e5a2b6650318b5ec04784edbba7614d1224.	2015-10-21 16:56:23 -04:00
Rob Rix	699e6ee30d	Leaf terms capture their text.	2015-10-21 16:53:47 -04:00
Rob Rix	cc7030701e	Syntax constructors don’t take the strings.	2015-10-21 16:53:31 -04:00
Rob Rix	f92daa8aeb	Recursive constructors close over a/b instead of passing them.	2015-10-21 16:52:49 -04:00
Rob Rix	2c542fbd66	Leaves hold their values.	2015-10-21 16:52:09 -04:00
Rob Rix	dc88a90b8a	Patches construct their own terms. ... Terms also only take a single string.	2015-10-21 16:51:19 -04:00
Rob Rix	3cc4a02dc7	Patch constructors take strings.	2015-10-21 16:47:32 -04:00
Rob Rix	d315f5aabe	Construct a single element.	2015-10-21 16:43:18 -04:00
Rob Rix	f30e7411a1	Construct DOM for replacements.	2015-10-21 16:40:02 -04:00
Rob Rix	1c6d3c2349	Construct DOM for insertions.	2015-10-21 16:39:55 -04:00
Rob Rix	909e32d1eb	And finally, retrieve elements from the right property.	2015-10-21 16:38:02 -04:00
Rob Rix	a9953d380b	Test the right property, too.	2015-10-21 16:37:08 -04:00
Rob Rix	6d2f891a95	Enumerate the right property.	2015-10-21 16:35:39 -04:00
Rob Rix	5347b50ad3	Construct keyed nodes as a definition list.	2015-10-21 16:34:20 -04:00
Rob Rix	25e9054d06	Return an element for leaves.	2015-10-21 16:32:21 -04:00
Rob Rix	86467ff4f4	Insert indexed nodes as a list.	2015-10-21 16:31:53 -04:00
Rob Rix	4f671e461c	Terms call directly recursively.	2015-10-21 16:30:51 -04:00
Rob Rix	d5d86e222c	Map diffs to divs.	2015-10-21 16:29:42 -04:00
Rob Rix	6ef105ab08	Stub in handling of leaf nodes.	2015-10-21 16:27:08 -04:00
Rob Rix	276f95c669	Construct Diffs recursively.	2015-10-21 16:26:36 -04:00
Rob Rix	be2e6f9a44	Rename view to model.	2015-10-21 16:25:46 -04:00
Rob Rix	87862e839b	Diffs are model objects.	2015-10-21 16:24:56 -04:00
Rob Rix	6a515d917d	Split things out into temporaries for debugging.	2015-10-21 16:23:25 -04:00
Rob Rix	b0bd628c4f	Construct leaves.	2015-10-21 16:22:19 -04:00
Rob Rix	db8c04bd6f	Construct terms directly.	2015-10-21 16:19:29 -04:00
Rob Rix	d31f3ce85d	Use Indexed/Keyed so we can differentiate leaves.	2015-10-21 16:17:30 -04:00
Rob Rix	3e58fd0ec3	Indexed/Keyed construct objects.	2015-10-21 16:16:11 -04:00
Rob Rix	cdebdecc9d	Add elements for keyed nodes.	2015-10-21 16:07:47 -04:00
Rob Rix	6848ecce46	Add elements for arrays.	2015-10-21 16:07:39 -04:00
Rob Rix	6ca9e84892	Map terms into DOM nodes.	2015-10-21 16:05:34 -04:00
Rob Rix	ee1c1acb5b	Don’t shadow the continuation.	2015-10-21 16:04:06 -04:00
Rob Rix	df4e37e5de	Add DOM stuff to the DOM.	2015-10-21 16:02:55 -04:00
Rob Rix	d425c007e6	keyed produces a hash.	2015-10-21 16:01:45 -04:00
Rob Rix	89f218021f	Leaves are just passed straight through.	2015-10-21 16:01:22 -04:00
Rob Rix	2bd26cd80c	indexed produces an array.	2015-10-21 16:00:43 -04:00
Rob Rix	17877c7f36	Construct new terms.	2015-10-21 15:58:55 -04:00
Rob Rix	ebd101b22f	Add a value for terms.	2015-10-21 15:58:00 -04:00
Rob Rix	2aa2e49f41	Return null.	2015-10-21 15:57:23 -04:00
Rob Rix	27f01cc43f	Construct new values.	2015-10-21 15:57:15 -04:00
Rob Rix	848f3ec654	Return the element representing deletions.	2015-10-21 15:55:02 -04:00
Rob Rix	d373c6829c	Remove the before/after elements.	2015-10-21 15:54:46 -04:00
Rob Rix	2232be5e9f	Pass the input strings around everywhere.	2015-10-21 15:54:10 -04:00
Rob Rix	a7c04a8214	Don’t fetch the before/after terms.	2015-10-21 15:51:47 -04:00
Rob Rix	f687283721	Map replacements into Replace values.	2015-10-21 15:51:40 -04:00
Rob Rix	ba55d8a5ad	Map deletion/insertion patches in the source diff into deletions/insertions.	2015-10-21 15:50:29 -04:00
Rob Rix	014efdc84e	Map deletions into DOM.	2015-10-21 15:50:13 -04:00
Rob Rix	9d3a6b9ec6	Add values for patches.	2015-10-21 15:50:06 -04:00
Rob Rix	f8f82a6b16	Pass the DOM elements.	2015-10-21 15:49:34 -04:00
Rob Rix	ead175b4e4	We do, now.	2015-10-21 14:10:51 -04:00
Rob Rix	49d0904b1b	term recurs through syntax.	2015-10-21 14:09:40 -04:00
Rob Rix	90ae03f234	Recur through replacements.	2015-10-21 14:08:43 -04:00
Rob Rix	6c1b0c0fa6	Use .notation instead of subscripting.	2015-10-21 14:08:35 -04:00
Rob Rix	18fde70e60	Handle insertions/deletions.	2015-10-21 13:01:05 -04:00
Rob Rix	4043a39b2b	term takes an element.	2015-10-21 12:59:47 -04:00
Rob Rix	698bc16a98	Find the before/after elements.	2015-10-21 12:59:37 -04:00
Rob Rix	0fd240ee3d	Stub in term handling.	2015-10-21 12:58:21 -04:00
Rob Rix	802f6f3f2b	diff is its own continuation.	2015-10-21 12:03:17 -04:00
Rob Rix	888379544c	Recur via the continuation.	2015-10-21 12:02:57 -04:00
Rob Rix	652b1ee699	We’ll need to handle annotated terms.	2015-10-21 12:02:10 -04:00
Rob Rix	8b9cfde29e	Process the top-level diff with diff.	2015-10-21 12:01:30 -04:00
Rob Rix	57456430a1	Pass a continuation around.	2015-10-21 12:01:19 -04:00
Rob Rix	d19f212467	We need to handle leaves.	2015-10-21 12:00:46 -04:00
Rob Rix	64fcc98221	Log the diff.	2015-10-21 11:59:56 -04:00
Rob Rix	61eff92eff	Call out to patch/syntax when processing a diff.	2015-10-21 11:59:48 -04:00
Rob Rix	f5380548e2	Annotate Free JSON output with the case explicitly. ... Diffs of diffs were getting pretty confusing.	2015-10-21 11:57:33 -04:00
Rob Rix	61bb54cdad	Stub in a function to process patches.	2015-10-21 11:49:03 -04:00
Rob Rix	3701da8d43	No margin/padding.	2015-10-21 11:48:46 -04:00
Rob Rix	e1ef212539	Merge branch 'load-json-diffs-in-ui' into diff-ui-shows-original-sources	2015-10-21 11:41:46 -04:00
Rob Rix	8eee045dfc	Merge branch 'master' into load-json-diffs-in-ui	2015-10-21 11:41:01 -04:00
joshvera	91c6ad085b	use sepBy	2015-10-21 11:25:37 -04:00
joshvera	7f5d5d354d	indentation	2015-10-21 11:25:33 -04:00
joshvera	2cf0464878	annotate error messages	2015-10-21 11:25:28 -04:00
joshvera	29755448db	handle newlines	2015-10-21 11:21:37 -04:00
Rob Rix	1ca7447e0f	Process the diff.	2015-10-21 11:17:39 -04:00
Rob Rix	5ba5589766	Add a function for processing syntax elements.	2015-10-21 11:17:33 -04:00
joshvera	cc7f84b6c7	indentation	2015-10-21 11:17:28 -04:00
Rob Rix	81cfdb5020	Add a function for processing keyed syntax elements.	2015-10-21 11:17:25 -04:00
Rob Rix	9aa2261b7d	Add a function for processing indexed elements.	2015-10-21 11:17:16 -04:00
joshvera	24cd71a09f	🔥 extension	2015-10-21 11:16:57 -04:00
Rob Rix	65ed7b6635	Remove toDOM.	2015-10-21 11:16:34 -04:00
Rob Rix	e7ee2f6aba	Populate the columns with the original sources.	2015-10-21 11:11:50 -04:00
joshvera	246e17b922	Parse numbers	2015-10-21 11:11:49 -04:00
Rob Rix	57f393c2cf	Paint the columns.	2015-10-21 11:11:37 -04:00
joshvera	81dc6c602e	Remove not combinator	2015-10-21 11:11:36 -04:00
Rob Rix	13113090fd	Treat whitespace in the columns as significant.	2015-10-21 11:11:30 -04:00
joshvera	f949bddaa2	++Madness	2015-10-21 11:11:30 -04:00
Rob Rix	7582eace28	Position the columns.	2015-10-21 11:11:14 -04:00
Rob Rix	c627af6324	Add column elements to the HTML.	2015-10-21 11:11:01 -04:00
Rob Rix	08f4e8c0e1	Wrap the diff in a hash containing both strings.	2015-10-20 18:03:04 -04:00
Rob Rix	3c8245a181	Remove the old UI fixtures.	2015-10-20 17:52:13 -04:00
Rob Rix	c19913abfd	Load diff.json.	2015-10-20 17:52:04 -04:00
Rob Rix	690cbb3866	Write the output to UI/diff.json.	2015-10-20 17:51:27 -04:00
Rob Rix	5d10383f64	Ignore a hypothetical diff.json file.	2015-10-20 17:51:08 -04:00
Rob Rix	8f6d3f545e	Hella diff.	2015-10-20 17:46:16 -04:00
Rob Rix	a19628c290	Write JSON for the diff to the passed path.	2015-10-20 17:46:07 -04:00
Rob Rix	261d241a53	Pass the path to the UI fixtures to doubt-json.	2015-10-20 17:45:32 -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	a7e7ca3b6f	Merge remote-tracking branch 'origin/parse-json' into output-source-range-annotations-to-json	2015-10-20 15:45:35 -04:00
joshvera	e8c1b36a2f	++Madness	2015-10-20 15:45:23 -04:00
joshvera	57610c88f6	++Madness	2015-10-20 15:43:02 -04:00
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
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