3193 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	6180986275	Merge branch 'ordered-map-but-this-time-working' into split-rendering-of-keyed-nodes	2015-12-14 17:59:28 -05:00
Rob Rix	a56d527f8d	Merge branch 'master' into ordered-map-but-this-time-working	2015-12-14 17:58:38 -05:00
Rob Rix	a6ef7a3457	Revert "Fix inverted semantics of union." ... This reverts commit 699bab3abd877104062ff3db8135b6cce093d533.	2015-12-14 17:57:41 -05:00
Rob Rix	2ee77fe490	Import OrderedMap instead of Data.Map.	2015-12-14 17:57:24 -05:00
Rob Rix	e96a77aa1a	Test the intersection.	2015-12-14 17:54:22 -05:00
Rob Rix	aeb99b54a0	Test the union.	2015-12-14 17:53:05 -05:00
Rob Rix	ab6658edc8	Extract the fixtures.	2015-12-14 17:51:15 -05:00
Rob Rix	26400a24a8	Import & run the OrderedMapSpec spec.	2015-12-14 17:49:40 -05:00
Rob Rix	0401bcb83d	Rename the spec function.	2015-12-14 17:48:59 -05:00
Rob Rix	7f488bb351	Knock the nesting out.	2015-12-14 17:47:42 -05:00
Rob Rix	2dbf0fc7c3	OrderedMapSpec imports hspec.	2015-12-14 17:44:42 -05:00
Rob Rix	aebf6dd488	Add a spec testing difference.	2015-12-14 17:43:49 -05:00
Rob Rix	205a885305	Stub in an OrderedMapSpec module.	2015-12-14 17:42:57 -05:00
Josh Vera	0278020f5d	Merge pull request #320 from github/ordered-map ... [WIP] Ordered map	2015-12-14 17:36:18 -05:00
Rob Rix	40f6df8b5d	Merge branch 'master' into ordered-map	2015-12-14 17:35:08 -05:00
Rob Rix	6840ff1f17	Use OrderedMap in Split.	2015-12-14 17:26:41 -05:00
Rob Rix	d34bf7db42	Merge branch 'ordered-map' into split-rendering-of-keyed-nodes	2015-12-14 17:25:59 -05:00
Rob Rix	7c70f748a2	Merge branch 'master' into split-rendering-of-keyed-nodes	2015-12-14 17:25:39 -05:00
Josh Vera	b6c0cf61e3	Merge pull request #328 from github/merge-implosion-is-the-name-of-my-next-band ... Correct some merge confusion.	2015-12-14 17:25:09 -05:00
Rob Rix	3c8b79f0b0	Correct some merge confusion.	2015-12-14 17:22:53 -05:00
Josh Vera	6850b402d4	Merge pull request #326 from github/post-process-leaf-nodes-in-terms ... Post process leaf nodes in terms	2015-12-14 17:20:16 -05:00
Rob Rix	86cf5df9e7	Merge pull request #327 from github/remove-info-line-range ... Remove line range from Info	2015-12-14 17:20:12 -05:00
Rob Rix	93cdcfc4e2	Extract the end index computation into a local binding.	2015-12-14 17:18:24 -05:00
Rob Rix	2cdbc9ad5e	Update the tests to point at OrderedMap.	2015-12-14 17:15:44 -05:00
joshvera	4d04a5b3dd	Remove getLineRange	2015-12-14 17:15:44 -05:00
joshvera	824cc801f0	Remove ts_node_p_start_point and ts_node_p_end_point	2015-12-14 17:15:40 -05:00
Rob Rix	5ecb5a6d1d	Merge branch 'master' into ordered-map	2015-12-14 17:13:58 -05:00
Rob Rix	62815448c1	Use OrderedMap everywhere.	2015-12-14 17:12:47 -05:00
Rob Rix	8819f02306	Add a difference binding.	2015-12-14 17:07:07 -05:00
Rob Rix	92a28ad38a	Fix inverted semantics of union.	2015-12-14 17:06:14 -05:00
Rob Rix	1e7dc0ff98	Define intersectionWith.	2015-12-14 17:00:30 -05:00
Rob Rix	e7175b524a	We already have a function for that.	2015-12-14 16:37:39 -05:00
Rob Rix	44c11647f8	Use the Alternative instance for skipping spaces too.	2015-12-14 16:34:52 -05:00
Rob Rix	645ae0b6de	Use the space atom.	2015-12-14 16:33:02 -05:00
Rob Rix	36e495f918	Parse words and punctuation via the atoms.	2015-12-14 16:32:31 -05:00
Rob Rix	cf072208fd	Extract word & punctuation & space into atoms.	2015-12-14 16:32:24 -05:00
Rob Rix	2ba26d8a47	Rename the function to reflect we care about spaces, not separators.	2015-12-14 16:31:29 -05:00
Rob Rix	2d2fc220fc	fmap takeAndContinue.	2015-12-14 16:29:57 -05:00
Rob Rix	d59d0dbe86	Space, not separator.	2015-12-14 16:28:02 -05:00
Rob Rix	771ed5673e	Use skipAndContinue in the space branch.	2015-12-14 16:27:50 -05:00
Rob Rix	025565ac68	Extract a skipAndContinue function.	2015-12-14 16:27:36 -05:00
Rob Rix	c1c50915d3	isSpace, not isSeparator.	2015-12-14 16:25:51 -05:00
Rob Rix	1d559b2b9a	Fewer parentheses.	2015-12-14 16:24:03 -05:00
Rob Rix	e9f21668a1	Use Alternative to combine our non-skipped parsers.	2015-12-14 16:23:09 -05:00
Rob Rix	835a3a0245	Parse spans of words & non-word punctuation.	2015-12-14 16:20:42 -05:00
Rob Rix	be9e4c7a01	Add a function to take a range & substring & continue.	2015-12-14 16:20:09 -05:00
Rob Rix	9e4071eb35	Remove the word/punctuation/space predicates.	2015-12-14 16:19:34 -05:00
Rob Rix	9af8783d1e	Add a word-or-separator predicate.	2015-12-14 16:19:21 -05:00
joshvera	f5dadfd964	fix tests	2015-12-14 16:09:12 -05:00
Rob Rix	a135c24967	Define the other parsers in terms of parse.	2015-12-14 16:08:52 -05:00