15389 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	c6f9ad1d8e	Define DiffF with a Patch constructor.	2017-09-13 09:24:11 -04:00
Rob Rix	327ce1ade3	🔥 some redundant imports.	2017-09-13 09:07:51 -04:00
Rob Rix	c1dd3906f8	Merge branch 'directed-acyclic-diffs' of https://github.com/github/semantic-diff into directed-acyclic-diffs	2017-09-12 20:10:35 -04:00
Rob Rix	cf2e428b2d	Merge branch 'master' into directed-acyclic-diffs	2017-09-12 20:10:25 -04:00
Rob Rix	7d872a6a88	Merge pull request #1332 from github/relocate-json-fields ... Relocate ToJSONFields	2017-09-12 20:09:47 -04:00
Rob Rix	6b13916136	Merge branch 'master' into relocate-json-fields	2017-09-12 19:57:43 -04:00
Rob Rix	7d31c314c0	Merge pull request #1331 from github/specialized-terms-and-diffs ... Specialized Terms and Diffs	2017-09-12 19:57:14 -04:00
Rob Rix	e19192b232	🔥 a load of Pretty* instances.	2017-09-12 16:19:18 -04:00
Rob Rix	5594453441	Define diffSum in terms of diffF.	2017-09-12 15:17:34 -04:00
Rob Rix	110a1641b7	Define a ToJSONFields1 instance for [].	2017-09-12 15:06:21 -04:00
Rob Rix	12a646009b	🔥 hoistBindingF.	2017-09-12 14:57:21 -04:00
Rob Rix	6c31ea4f9b	🔥 redundant imports.	2017-09-12 11:43:58 -04:00
Rob Rix	fcc05e114b	Update a fixture.	2017-09-12 11:00:51 -04:00
Rob Rix	4b7849c896	Redefine diffPatches.	2017-09-12 10:57:09 -04:00
Rob Rix	ecb19530d6	Correct most of the tests.	2017-09-12 10:49:45 -04:00
Rob Rix	f4e475104f	Rename copy to merge.	2017-09-12 10:49:37 -04:00
Rob Rix	a140d2f4c4	Correct the Listable1 instance for Diff.	2017-09-12 10:47:50 -04:00
Rob Rix	d0a1d31c68	Correct the Listable2 instance for DiffF.	2017-09-12 10:46:49 -04:00
Rob Rix	b3b81846b3	Define a Listable1 instance for BindingF.	2017-09-12 10:44:19 -04:00
Rob Rix	57f578618c	Define Listable1 instances for Sum & Product.	2017-09-12 10:43:31 -04:00
Rob Rix	19ae29284f	Correct double parens & indentation around diff nodes.	2017-09-12 08:58:33 -04:00
Rob Rix	16b894e027	Define printDiffF in terms of diffF characterization.	2017-09-12 08:48:53 -04:00
Rob Rix	38c6795e7e	Define tableOfContentsBy in terms of diffF characterization.	2017-09-12 08:46:41 -04:00
Rob Rix	7f8eda8605	Define alignDiff in terms of diffF characterization.	2017-09-12 08:45:09 -04:00
Rob Rix	fa3a0e08dc	Redefine diffFPatch as a diffF function characterizing diffs.	2017-09-12 08:43:55 -04:00
Rob Rix	17ebab9803	Define a helper constructing a Patch from a DiffF.	2017-09-12 08:37:58 -04:00
Rob Rix	a13ca9817b	Define a function constructing a Patch from a Diff.	2017-09-12 08:35:34 -04:00
Rob Rix	fb9dd790ba	Merge branch 'relocate-json-fields' into directed-acyclic-diffs	2017-09-11 16:44:57 -04:00
Rob Rix	f40fdda887	Merge branch 'specialized-terms-and-diffs' into relocate-json-fields	2017-09-11 16:43:47 -04:00
Rob Rix	96323a9095	Use termIn widely.	2017-09-11 16:43:23 -04:00
Rob Rix	d5f3e0c9c4	🔥 a redundant import.	2017-09-11 16:21:10 -04:00
Rob Rix	c2f4ef3572	Merge branch 'relocate-json-fields' into directed-acyclic-diffs	2017-09-11 16:20:57 -04:00
Rob Rix	6d61c1b683	Merge branch 'specialized-terms-and-diffs' into relocate-json-fields	2017-09-11 16:12:25 -04:00
Rob Rix	2c83e7e283	Merge branch 'master' into specialized-terms-and-diffs	2017-09-11 16:01:20 -04:00
Rob Rix	1cd6dd2899	Update the tests.	2017-09-11 15:48:58 -04:00
Rob Rix	5df09cd261	📝 termIn.	2017-09-11 15:43:52 -04:00
Rob Rix	56e9982960	Define a Term smart constructor.	2017-09-11 15:43:31 -04:00
Rob Rix	3cc8440fae	Rename the TermF constructor to In.	2017-09-11 15:36:23 -04:00
Rob Rix	c29a9671f0	Rename termSyntax to termOut.	2017-09-11 15:24:09 -04:00
Rob Rix	2d25dd44f9	Update TOC.	2017-09-11 15:21:25 -04:00
Rob Rix	8195c99255	Update Alignment.	2017-09-11 15:16:27 -04:00
Rob Rix	042d46c732	Update Interpreter.	2017-09-11 12:58:37 -04:00
Rob Rix	828176f64e	Update the s-expression renderer.	2017-09-11 12:54:47 -04:00
Rob Rix	da7966a4c5	copy no longer takes its parameters in Both.	2017-09-11 12:28:56 -04:00
Rob Rix	2838447f04	Define Diff using BindingF and recursively constructed diffs.	2017-09-11 12:02:22 -04:00
Rob Rix	e555eb8676	Merge pull request #1329 from github/explicit-choice ... Explicit choice	2017-09-11 17:00:30 +01:00
Rob Rix	946ee44707	Spacing.	2017-09-11 11:57:36 -04:00
Rob Rix	3d5e359f44	Define a Pretty1 instance for DiffF.	2017-09-11 11:57:30 -04:00
Rob Rix	583249fce9	Define hoisting of TermFs.	2017-09-11 11:06:41 -04:00
Rob Rix	e745372f61	Define Pretty instances for products/sums of unions.	2017-09-11 11:00:31 -04:00