7730 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	42f18e9b4f	Use the getters instead of destructuring.	2016-07-11 14:03:54 -04:00
Rob Rix	26757185d9	Use a more efficient pattern of recursion.	2016-07-11 14:03:05 -04:00
Rob Rix	40df2f9576	Add an annotation-combining function to alignCofreeWith.	2016-07-11 14:01:45 -04:00
Rob Rix	e23fa323db	Rename some type parameters for tidiness’ sake.	2016-07-11 14:00:36 -04:00
Rob Rix	921d0d9356	Clean up the language extensions for the Term module.	2016-07-11 13:59:27 -04:00
Rob Rix	d1219d04f2	🔥 a redundant import.	2016-07-11 13:58:28 -04:00
Rob Rix	a9577a2037	🔥 the hand-rolled alignSyntax' function.	2016-07-11 13:57:53 -04:00
Rob Rix	ee260949ea	Move GAlign into its own module.	2016-07-11 13:57:11 -04:00
Rob Rix	6c16a071bb	Stub in a generic align module.	2016-07-11 13:55:27 -04:00
Rob Rix	119c2350d4	Use the Data.Align instances for generic alignment of lists and ordered maps.	2016-07-11 13:54:04 -04:00
joshvera	680fe1304c	Delete or Insert entire diff if one side of the source blobs is empty	2016-07-11 12:57:10 -04:00
joshvera	1dfae9a1b9	Add Object/Pair/Commented/Comment cases to diffSummary	2016-07-11 12:56:00 -04:00
joshvera	6c58c1b50a	Add Object/Pair/Comment to toTermName	2016-07-11 12:55:32 -04:00
Rob Rix	f1f542cc2c	Add an instance for Syntax.	2016-07-11 12:21:40 -04:00
Rob Rix	796aa327f0	Tidy up the GAlign instance over sums.	2016-07-11 12:20:47 -04:00
joshvera	830a81774a	Capture the rest of termToDiffInfo cases as a function of their toTermName	2016-07-11 12:20:40 -04:00
Rob Rix	d9e5a633b8	🔥 galignDefault.	2016-07-11 12:20:09 -04:00
Rob Rix	2e15957f01	Just use the default galign definition.	2016-07-11 12:19:58 -04:00
Rob Rix	03871b56be	Give a default signature and definition of galign.	2016-07-11 12:19:28 -04:00
Rob Rix	b7a1609845	Add a GAlign instance for OrderedMap.	2016-07-11 12:18:32 -04:00
Rob Rix	ba71516f02	Derive a Generic1 instance for Syntax.	2016-07-11 12:18:20 -04:00
Rob Rix	cc24872a46	Derive a Generic1 instance for OrderedMap.	2016-07-11 12:18:11 -04:00
Rob Rix	05a2266aca	Implement alignment over compositions of functors.	2016-07-11 12:18:00 -04:00
Rob Rix	8b7bbc5195	Try defining GAlign over pairs.	2016-07-11 12:13:17 -04:00
Rob Rix	598a716f38	Turn off the warning about our use of error.	2016-07-11 12:09:09 -04:00
Rob Rix	34c59cc70e	Placate hlint.	2016-07-11 12:08:58 -04:00
Rob Rix	6b7f315987	Make generic alignment explicitly partial instead.	2016-07-11 11:57:46 -04:00
Rob Rix	fa88b23fdc	Contrast sums.	2016-07-11 11:54:16 -04:00
Rob Rix	57cfaa3e36	GAlign implies Functor.	2016-07-11 11:54:11 -04:00
Rob Rix	bf98d23d8f	The contrasting function takes functors.	2016-07-11 11:54:03 -04:00
Rob Rix	c597a8cfa6	Pass a contrasting function around.	2016-07-11 11:47:16 -04:00
Rob Rix	f97169b064	We no longer need syb.	2016-07-11 11:46:58 -04:00
Rob Rix	748bdbfc72	Merge branch 'master' into generic-zip	2016-07-11 11:41:58 -04:00
Rob Rix	dd4c1d9fde	Replace alignF with a typeclass for alignment.	2016-07-11 11:39:02 -04:00
Rob Rix	5ffecda63c	Pretty sure that guard is redundant to the one in alignM.	2016-07-08 18:00:28 -04:00
Rob Rix	6c2948e317	Try to implement alignment over functors. Try, and fail miserably.	2016-07-08 17:59:54 -04:00
joshvera	a484cb8348	Update fixtures to account for method_call and object/pair categories	2016-07-08 16:30:13 -04:00
joshvera	90d514bfd2	Add Pair/Comment/Commented cases to run	2016-07-08 16:19:50 -04:00
joshvera	8c698cb52c	Remove stray HTML file	2016-07-08 16:00:14 -04:00
joshvera	3779bf36b0	Expect to parse JS method calls	2016-07-08 15:59:37 -04:00
joshvera	847465c1b5	Add more remaining symmetric cases to zipUnwrap	2016-07-08 15:48:12 -04:00
joshvera	28457049f2	Add some vertical space to ease debugging	2016-07-08 15:19:43 -04:00
Rob Rix	15a0022152	The contrasting function must be polymorphic.	2016-07-08 14:04:16 -04:00
Rob Rix	f6ba2f8408	Implement a partial alignment function for Syntax.	2016-07-08 14:01:09 -04:00
Rob Rix	59bc42b731	Don’t attempt to align non-overlapping terms.	2016-07-08 14:00:07 -04:00
Rob Rix	032dcb047b	Pass both the syntaxes to the helper function directly.	2016-07-08 13:57:25 -04:00
Rob Rix	9242d2fe7c	Add an alignment function over Cofree f a.	2016-07-08 13:44:29 -04:00
Rob Rix	39a1869bf5	Add a (naïve) Align instance over OrderedMap.	2016-07-08 13:38:48 -04:00
joshvera	772575dffd	Add zipUnwrap cases for Comment and Commented	2016-07-08 13:27:41 -04:00
joshvera	3ee4c062d6	import Category as C	2016-07-08 13:16:23 -04:00