2222 Commits

Author	SHA1	Message	Date
Rob Rix	cd1601efbe	Always advance on the intersecting side.	2016-04-04 13:34:21 -04:00
Rob Rix	16b08e3327	Advance along the sides that the child actually occupied.	2016-04-04 13:27:38 -04:00
Rob Rix	1f367274e7	advanceLeft/advanceRight are simple bifunctorial functions.	2016-04-04 13:21:05 -04:00
Rob Rix	522fd02b59	Rename first to firstLine.	2016-04-04 13:19:58 -04:00
Rob Rix	3d4f9a83f0	Use mask to select only the sides that the original child had.	2016-04-04 12:44:05 -04:00
Rob Rix	bb38e3dfa6	Add yet another gross function, this time to mask These with another These. ... This is a bit like some bimap version of <$.	2016-04-04 12:43:32 -04:00
Rob Rix	8971b40e77	Take both sides when merging.	2016-04-04 12:43:11 -04:00
Rob Rix	7e23ffd86f	Concatenate the unused side after splitting. ... I suspect this will behave identically, but it is slightly more accurate to our intention.	2016-04-01 16:04:55 -04:00
Rob Rix	1b1e88b4fd	Define pairRangesWithLine over a Monoid instance to be total.	2016-04-01 10:56:44 -04:00
Rob Rix	8104f174ab	Extract pairRangesWithLine to the top level.	2016-04-01 10:55:25 -04:00
Rob Rix	410a3044f9	Extract advanceLeft/advanceRight to top level.	2016-04-01 10:40:39 -04:00
Rob Rix	a582931a52	fmap outside of pairRangesWithLine.	2016-03-31 18:15:04 -04:00
Rob Rix	24ad721189	Rename atLeft/Right to advanceLeft/Right.	2016-03-31 18:08:02 -04:00
Rob Rix	dd1355e978	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-03-31 18:01:49 -04:00
Rob Rix	3c11287729	🔥 maybeThese.	2016-03-31 18:00:03 -04:00
Rob Rix	6b00768ddf	🔥 spanMergeable.	2016-03-31 17:59:50 -04:00
Rob Rix	20ba0e37fd	Rename pairRangeWithLine to pairRangesWithLine.	2016-03-31 17:44:10 -04:00
Rob Rix	2bc86aec0b	Fix some misindentation.	2016-03-31 17:43:06 -04:00
Rob Rix	4878ed27df	Split up children when merging asymmetrically.	2016-03-31 17:15:34 -04:00
Rob Rix	a56219d4d8	Lazily bind the splitting of the first line of the child.	2016-03-31 17:13:22 -04:00
Rob Rix	507595eed5	Only recur via the separate pattern.	2016-03-31 17:11:01 -04:00
Rob Rix	daca37bc24	Recur via a separate pattern. ... This reverts commit 985ad3d43055c0773e85623db4a29fda8656ddbb.	2016-03-31 17:10:25 -04:00
Rob Rix	da3f04100e	Merge branch 'master' into one-header-per-file	2016-03-31 17:00:37 -04:00
Rob Rix	7442a180d6	group2 advances through the list of children.	2016-03-31 16:07:11 -04:00
Rob Rix	f1dea045e0	Rename the restOfChild binding to remainingLines.	2016-03-31 15:58:17 -04:00
Rob Rix	293d27d123	🔥 redundant parens.	2016-03-31 15:38:38 -04:00
Rob Rix	dea54b6790	Rename x to pairRangeWithLine.	2016-03-31 15:38:27 -04:00
Rob Rix	86cd2742c4	🔥 the annotation for x because it is chaff.	2016-03-31 15:38:21 -04:00
Rob Rix	669f6bef32	Output lines when no child intersects them.	2016-03-31 15:34:14 -04:00
Rob Rix	5376256525	Don’t bind the heads when we only use the tails.	2016-03-31 15:18:48 -04:00
Rob Rix	efeba311c7	🔥 uncons.	2016-03-31 15:18:22 -04:00
Rob Rix	308a78b61f	🔥 the rrrraaaangggeessss binding.	2016-03-31 15:18:00 -04:00
Rob Rix	f96a592152	Output lines after we’ve exhausted the children.	2016-03-31 15:13:35 -04:00
Rob Rix	2fa67f48e4	groupChildrenByLine calls out to group2.	2016-03-31 15:06:01 -04:00
Rob Rix	30b58becf1	Handle the Nothing/Nothing case.	2016-03-31 15:04:33 -04:00
Rob Rix	b3d202accb	group2 pairs children with ranges.	2016-03-31 15:02:47 -04:00
Rob Rix	030ea2d1f5	group2 returns lists of children per line.	2016-03-31 15:01:11 -04:00
Rob Rix	5732aa30c8	Add some context comments about the problem cases.	2016-03-31 14:45:19 -04:00
Rob Rix	2da930ae53	Add a function to construct Maybe These from two Maybes.	2016-03-31 14:45:04 -04:00
Rob Rix	84d49ed4e2	Add a group2 function which advances through ranges for a given child.	2016-03-31 14:44:44 -04:00
Rob Rix	3dbed9510b	Add an Align instance for Maybe.	2016-03-31 14:44:23 -04:00
joshvera	5ff0d38a2f	Make sure we actually show 2 hunks in the test	2016-03-31 13:53:47 -04:00
joshvera	4fafbda1de	Test multiple hunks only has one header	2016-03-31 13:20:14 -04:00
joshvera	f35b88eabd	One header per file	2016-03-31 12:31:28 -04:00
Rob Rix	e5192708e0	Revert "Only take the first line from each child." ... This reverts commit 439e9358ee46be695cf651ed35dc9f988e757b9d.	2016-03-31 10:01:45 -04:00
Rob Rix	8d808e32ca	Revert "Skip a recursive call when we haven’t yet exhausted the lines in a child." ... This reverts commit 6da256ef89752bf312a0ba40cf571ff8f410c436.	2016-03-31 10:01:42 -04:00
Rob Rix	19cc23b51a	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly ... # Conflicts: # src/Diff.hs	2016-03-30 20:20:50 -04:00
Rob Rix	e8fbe8c789	Move Info into its own module.	2016-03-30 17:26:52 -04:00
Rob Rix	75677fa8aa	Add a module for Info.	2016-03-30 17:12:39 -04:00
Rob Rix	5bc8e9b582	Skip a recursive call when we haven’t yet exhausted the lines in a child.	2016-03-29 16:07:53 -04:00