6397 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	b09abb7f10	Extract getRange to the top level.	2016-05-17 12:22:21 -04:00
Rob Rix	11bbde744a	Fix a shadowing error. ... So maybe I shouldn’t be so comfortable with shadowing after all.	2016-05-17 12:18:47 -04:00
Rob Rix	5f481de057	Rename symmetricalChildren (since only the first, if any, is guaranteed to be symmetrical).	2016-05-17 12:13:14 -04:00
Rob Rix	363a96c527	Note a case we want to handle correctly.	2016-05-17 12:11:46 -04:00
Rob Rix	ef9cf21d03	Only process asymmetrical intersecting children.	2016-05-17 12:08:22 -04:00
Rob Rix	8ef363713e	Split the intersecting children into asymmetrical & symmetrical sublists.	2016-05-17 12:01:31 -04:00
Rob Rix	a380ae2147	Rename lines to children.	2016-05-16 14:46:23 -04:00
Rob Rix	e3d6cc9037	Drop empty children. ... Fixes an issue where asymmetrical children were not being collected into the top-level parent branch.	2016-05-16 13:26:09 -04:00
Rob Rix	2cbefee68b	Don’t reprocess the nonintersecting split-off first lines.	2016-05-16 12:57:01 -04:00
Rob Rix	e40434f476	Test that we align insertions into empty branches without losing nodes.	2016-05-16 12:37:13 -04:00
Rob Rix	ba7988454b	Add notes from our inaugural weekly meeting.	2016-05-16 11:31:44 -04:00
Rob Rix	6f819341ab	Test that we align insertions which span the entirety of the thing.	2016-05-16 10:54:56 -04:00
Rob Rix	8f05beb023	Spacing for alignment.	2016-05-16 10:41:10 -04:00
Rob Rix	555fd7d124	Correct the inverted boolean.	2016-05-14 01:30:49 -04:00
Rob Rix	65827f17ac	Correct the docs of why we pick left first.	2016-05-14 01:19:04 -04:00
Rob Rix	9cea134ee6	Call into alignBranch for Fixed nodes too.	2016-05-13 23:24:30 -04:00
Rob Rix	2008b63c17	Compute the maximum value in each element correctly.	2016-05-13 18:44:27 -04:00
Rob Rix	9567c44c57	Guarantee non-empty by prepending.	2016-05-13 18:38:19 -04:00
Rob Rix	c02e6c80a5	Pretty all the diffs.	2016-05-13 18:27:38 -04:00
Rob Rix	a5e11db66d	Pull align out to the top level.	2016-05-13 18:25:42 -04:00
Rob Rix	9b398ebd99	Avoid using head.	2016-05-13 18:17:01 -04:00
Rob Rix	c0a1d5b14b	Only advance past lines we’ve actually taken.	2016-05-13 18:11:06 -04:00
Rob Rix	ebea3e1542	Align asymmetrically.	2016-05-13 18:07:41 -04:00
Rob Rix	97b8b7d4f8	lineAndRemaining takes its parameters in the opposite order.	2016-05-13 17:56:34 -04:00
Rob Rix	19870ee871	Add a function to produce a line and return the remaining lines.	2016-05-13 17:53:24 -04:00
Rob Rix	abd6221696	Pass headRanges to alignChildren instead of closing over it.	2016-05-13 17:42:17 -04:00
Rob Rix	de254b953f	Split up lines in the asymmetrical cases in alignChildren.	2016-05-13 17:38:54 -04:00
Rob Rix	b19f6fe81a	Split the first-line-to-Both-terms stuff into a function.	2016-05-13 17:34:28 -04:00
Rob Rix	0f2467e82a	Handle the asymmetric cases disjointly.	2016-05-13 17:32:31 -04:00
Rob Rix	25831c5685	Test the intersections by side explicitly.	2016-05-13 17:31:21 -04:00
Rob Rix	312d9aec26	Use the existing definition of intersects.	2016-05-13 17:29:37 -04:00
Rob Rix	eecca41524	Correct the type of children.	2016-05-13 17:27:41 -04:00
Rob Rix	a624678778	alignChildren recurs in the symmetrical case.	2016-05-13 17:18:09 -04:00
Rob Rix	28c0672afd	Use alignChildren to grab the first lines, then recur.	2016-05-13 17:16:11 -04:00
Rob Rix	f8b07fecae	Stub in recursively selecting & splitting the first lines of children.	2016-05-13 17:15:45 -04:00
Rob Rix	d166581f37	Handle the degenerate case of intersects.	2016-05-13 16:52:42 -04:00
Rob Rix	8fecee4b83	We don’t use the nonintersecting children.	2016-05-13 16:52:10 -04:00
Rob Rix	2da3548b8b	Stub in the asymmetrical/symmetrical alignment choice.	2016-05-13 16:51:50 -04:00
Rob Rix	d351fb5497	Handle the case where no children intersect on either side.	2016-05-13 16:46:53 -04:00
Rob Rix	3357dc5f82	Stub in an alignBranch function.	2016-05-13 16:40:46 -04:00
Rob Rix	df043b52b8	Stub in some type synonyms.	2016-05-13 16:40:38 -04:00
Rob Rix	8862fc35c1	Write down some properties we’d like to hold.	2016-05-13 16:40:18 -04:00
Rob Rix	b9673bb0ee	Write down some overall behaviours we expect.	2016-05-13 16:40:10 -04:00
Rob Rix	7a4f2b98c8	Write down some notes about alignSyntax.	2016-05-13 16:39:48 -04:00
Rob Rix	bdd03bb122	For now, children should be aligned at a higher priority than their parents. ... This came out of https://github.com/github/semantic-diff/pull/558.	2016-05-13 10:51:52 -04:00
Rob Rix	d461053e71	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-05-13 10:47:06 -04:00
Rob Rix	0c2ef09372	Merge pull request #555 from github/vendor-test-repos ... Mark the test repos as vendored.	2016-05-03 13:51:59 -04:00
Rob Rix	1e5a16420c	Merge branch 'master' into vendor-test-repos	2016-05-03 13:50:59 -04:00
Rob Rix	5e5cc504bf	Mark the test repos as vendored.	2016-05-03 13:49:40 -04:00
Rob Rix	c92f000b3d	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-04-27 20:10:08 -04:00