2037 Commits

Author	SHA1	Message	Date
Rob Rix	ad0dffe20c	Explore Fixed terms in diffs.	2015-11-04 16:34:47 -05:00
Rob Rix	51166a0e0f	Explore Indexed terms in diffs.	2015-11-04 16:34:37 -05:00
Rob Rix	51293d2202	Variadic branch convenience constructor.	2015-11-04 16:34:20 -05:00
Rob Rix	bac71d1f24	Construct Location over variadic branches.	2015-11-04 16:34:03 -05:00
Rob Rix	80a29789ad	Patches & leaves are nullary.	2015-11-04 16:22:42 -05:00
Rob Rix	29645e0d99	Stub in Free.explore()	2015-11-04 16:22:29 -05:00
Rob Rix	d362c1b26f	Formatting.	2015-11-04 16:15:26 -05:00
Rob Rix	63aaa39ba4	The private properties are implementation details.	2015-11-04 16:14:43 -05:00
joshvera	d99000562b	++Madness	2015-11-04 16:07:25 -05:00
joshvera	aeaabfd6a9	update Info.==	2015-11-04 16:06:54 -05:00
joshvera	eff47e0a3e	Construct terms with line and column info	2015-11-04 15:12:22 -05:00
joshvera	dd8d4bac2c	Parameterize CofreeJSON by SourcePos	2015-11-04 15:11:35 -05:00
joshvera	92c4141b44	bump Madness	2015-11-04 15:11:09 -05:00
joshvera	2cb3521cb0	Pass Line and Column to Info	2015-11-04 15:11:01 -05:00
Rob Rix	c1f3b5e01f	Reference the specific section of Weaving a Web implemented.	2015-11-04 12:50:34 -05:00
Rob Rix	31dd09a080	Document Location.	2015-11-04 12:43:50 -05:00
Rob Rix	920c08c80e	Document a couple of fields.	2015-11-04 12:43:46 -05:00
Rob Rix	d29277a60a	Correct a couple of comments.	2015-11-04 12:43:37 -05:00
joshvera	26dd51eb49	Merge remote-tracking branch 'origin/master' into line-numbers	2015-11-04 12:34:59 -05:00
joshvera	a8e378cafa	++Madness	2015-11-04 12:34:36 -05:00
Rob Rix	03def65a8e	Add Location.	2015-11-04 12:11:18 -05:00
joshvera	7f014eff8e	Merge branch 'master' into syntax-highlighting	2015-11-03 17:09:06 -05:00
Rob Rix	5b23d62b48	Split mode.	2015-11-03 15:38:59 -05:00
Rob Rix	9e1ceccc77	Highlight for/in statements.	2015-11-03 15:30:34 -05:00
Rob Rix	e096881578	Rename rangeAndSyntaxToDOM.	2015-11-03 15:26:32 -05:00
Rob Rix	f5c21074c5	Don’t flatten terms.	2015-11-03 15:25:52 -05:00
Rob Rix	ea96c3d580	Highlight within patches.	2015-11-03 15:16:43 -05:00
Rob Rix	5e6c94fd75	Pass the whole annotation into rangeAndSyntaxToDOM.	2015-11-03 15:16:36 -05:00
Rob Rix	dbeb9073a3	Highlight function names.	2015-11-03 15:13:39 -05:00
Rob Rix	f38da39f86	Highlight regexps.	2015-11-03 15:12:44 -05:00
Rob Rix	94c6297026	Highlight type names.	2015-11-03 15:09:55 -05:00
Rob Rix	a33eec8c58	Highlight new.	2015-11-03 15:09:50 -05:00
Rob Rix	dbc59507e9	Highlight undefined.	2015-11-03 15:07:20 -05:00
Rob Rix	787cb679b1	Highlight null.	2015-11-03 15:07:17 -05:00
Rob Rix	1216c34d21	Highlight the operators en masse.	2015-11-03 15:06:58 -05:00
Rob Rix	fbf1704425	Highlight function calls.	2015-11-03 15:00:49 -05:00
Rob Rix	85e634dbd1	Highlight assignments.	2015-11-03 14:57:22 -05:00
Rob Rix	767aecd690	Highlight relational operators.	2015-11-03 14:56:52 -05:00
Rob Rix	50c7575ecd	Highlight ternaries.	2015-11-03 14:55:51 -05:00
Rob Rix	440a7326fb	Highlight true and false.	2015-11-03 14:54:28 -05:00
Rob Rix	e1a4a97c46	Highlight keys in objects.	2015-11-03 14:51:41 -05:00
Rob Rix	f006b7f95c	Only match the assigned-to property with this rule.	2015-11-03 14:49:45 -05:00
Rob Rix	684a6f24ae	Match member assignment a little more carefully.	2015-11-03 14:48:30 -05:00
Rob Rix	eca1b0e2b2	Match member access a little more carefully.	2015-11-03 14:48:22 -05:00
Rob Rix	9b78911a04	Highlight a bunch of operators and statements.	2015-11-03 14:40:37 -05:00
Rob Rix	fbeee38bd4	Highlight comments.	2015-11-03 14:35:19 -05:00
Rob Rix	4deba67404	Highlight member accesses.	2015-11-03 14:35:12 -05:00
Josh Vera	28d89241d5	Merge pull request #210 from github/benchmark-parsing-and-diffing ... Benchmarks & optimization	2015-11-03 14:34:50 -05:00
Rob Rix	ad9e9f7a1d	Don’t inherit syntax highlighting by default.	2015-11-03 14:31:36 -05:00
Rob Rix	0c9698c75d	Prefix the highlighting selectors with .diff.	2015-11-03 14:31:22 -05:00
Rob Rix	2081b7447f	Highlight numbers.	2015-11-03 14:12:45 -05:00
Rob Rix	2d18d653c8	Highlight strings.	2015-11-03 14:12:41 -05:00
joshvera	06c096bcbe	++Madness	2015-11-03 14:12:35 -05:00
Rob Rix	880d51ffd8	Add CSS classes for the various categories.	2015-11-03 14:08:32 -05:00
Rob Rix	547ab8d3d2	Unpack the ranges.	2015-11-03 14:03:55 -05:00
Rob Rix	4ff4f570bd	We no longer use termToDOM.	2015-11-03 13:59:57 -05:00
Rob Rix	4a31774d98	Extract the correct ranges.	2015-11-03 13:58:59 -05:00
Rob Rix	ad3462b135	Terms are annotated with their categories in the JSON too.	2015-11-03 13:20:38 -05:00
Rob Rix	edcb850f93	Extract range & categories.	2015-11-03 13:20:01 -05:00
Rob Rix	9be365ce30	Indentation.	2015-11-03 13:12:35 -05:00
Rob Rix	5d15e3c88d	dom.js is gone.	2015-11-03 13:11:50 -05:00
Rob Rix	efc90df9ee	I guess this was deleted.	2015-11-03 13:09:01 -05:00
Rob Rix	75400c4065	Serialize annotations out in full.	2015-11-03 13:08:32 -05:00
Josh Vera	b8ceaa445e	s/prevous/previous	2015-11-03 13:04:48 -05:00
joshvera	9f2d594cc9	🔥 logs	2015-11-03 12:41:08 -05:00
Rob Rix	939818bbf4	Disable safety checks in release builds.	2015-11-03 12:02:03 -05:00
Rob Rix	db614b5b16	Benchmark loading sources.	2015-11-03 11:56:01 -05:00
joshvera	5f43e526c2	Merge remote-tracking branch 'origin/master' into show-empty-space	2015-11-03 11:47:29 -05:00
joshvera	92feb67ae8	delete obselete code	2015-11-03 11:47:16 -05:00
Rob Rix	1b8e5850f5	Move preconditions into where clauses.	2015-11-03 11:28:52 -05:00
Rob Rix	cd720b79de	Fuse Keyed equality in Syntax.equals.	2015-11-03 11:27:54 -05:00
Rob Rix	ae27114f33	Fuse Fixed equality in Syntax.equals.	2015-11-03 11:26:56 -05:00
Rob Rix	127c3b5d75	Fuse Indexed equality in Syntax.equals.	2015-11-03 11:26:48 -05:00
Rob Rix	a372b7aaaf	Remove Free.analysis.	2015-11-03 11:21:41 -05:00
Rob Rix	db7c1dc1ef	Switch in Free.JSON directly.	2015-11-03 11:21:16 -05:00
Rob Rix	4f16ce62c3	Switch in Free.map directly.	2015-11-03 11:19:33 -05:00
Rob Rix	02af784036	Nothing ever flat maps a Free.	2015-11-03 11:18:13 -05:00
Rob Rix	4169d8d554	Switch in Free.cata directly.	2015-11-03 11:17:41 -05:00
Rob Rix	13c37a1178	Nothing ever maps an Algorithm either.	2015-11-03 11:15:33 -05:00
Rob Rix	45ecdde53a	Remove Algorithm.analysis.	2015-11-03 11:15:01 -05:00
Rob Rix	90cd2ee2d7	Nothing ever flat maps an Algorithm.	2015-11-03 11:13:59 -05:00
Rob Rix	c15c2715f5	Rewrite annotating hylo without composition.	2015-11-03 11:04:04 -05:00
Rob Rix	b6436e91f6	Rewrite hylo without composition.	2015-11-03 11:03:57 -05:00
joshvera	86e1e8ae8b	hide the empty nodes	2015-11-03 10:48:01 -05:00
joshvera	78ba276948	append index beforehand	2015-11-03 10:45:32 -05:00
Rob Rix	022de3c657	TermType.para rethrows errors.	2015-11-03 10:40:19 -05:00
Rob Rix	196ab28c13	TermType.cata rethrows errors.	2015-11-03 10:40:12 -05:00
Rob Rix	2a102aad02	Fix a doc comment.	2015-11-03 10:39:59 -05:00
Rob Rix	1442bc6cf7	CofreeType.cata rethrows errors.	2015-11-03 10:39:42 -05:00
Rob Rix	e4e57932cf	Remove unused operators.	2015-11-03 10:38:18 -05:00
Rob Rix	ea966e9780	Don’t debug doc versioning when profiling.	2015-11-03 10:32:44 -05:00
Rob Rix	17d101f17c	Move ChildrenCollection outside of TSNode. ... This is necessary to be able to link in release config.	2015-11-03 10:20:31 -05:00
Rob Rix	a0b3738ee2	Benchmark parsing both inputs.	2015-11-03 10:20:15 -05:00
Rob Rix	74fa7ba1b4	Benchmark diffing.	2015-11-03 10:20:11 -05:00
Rob Rix	c1b7993895	Benchmark formatting with a label.	2015-11-03 10:20:02 -05:00
Rob Rix	2651c5ac51	benchmark rethrows.	2015-11-03 10:19:51 -05:00
Rob Rix	a646f03748	Switch on the right parameter.	2015-11-02 18:11:51 -05:00
Rob Rix	c6ad7e3df2	Remove the doubt-json scheme.	2015-11-02 18:11:17 -05:00
Rob Rix	3865fe9e71	Fix the test of dumbness.	2015-11-02 18:09:14 -05:00
Rob Rix	2ec0a752a0	Remove an unused value.	2015-11-02 18:06:54 -05:00
Rob Rix	586e8cdf6b	Consider nil TERM to be dumb.	2015-11-02 18:06:23 -05:00
Rob Rix	74714da9d7	Output the raw values, not names.	2015-11-02 18:03:49 -05:00
Rob Rix	c89aa9c16f	Red and green, bold.	2015-11-02 18:03:02 -05:00
Rob Rix	a22491ceda	Console attributes.	2015-11-02 18:02:37 -05:00
Rob Rix	75703e1561	Should we format?	2015-11-02 17:41:56 -05:00
Rob Rix	e4ff0e4a89	Is it a dumb TTY?	2015-11-02 17:39:47 -05:00
Rob Rix	1934d65b99	Are we talking to a TTY?	2015-11-02 17:39:42 -05:00
Rob Rix	a78564506b	Format the terms.	2015-11-02 17:30:41 -05:00
Rob Rix	8c2e1f6f50	Sort keyed children using the ordering.	2015-11-02 17:29:43 -05:00
Rob Rix	a740dcceee	Add a partial ordering on keyed children.	2015-11-02 17:29:35 -05:00
Rob Rix	84e111c1c1	Stringify keyed terms.	2015-11-02 17:28:21 -05:00
Rob Rix	02c31d7be4	Stringify fixed terms.	2015-11-02 17:26:38 -05:00
Rob Rix	1242534be6	Stringify indexed terms.	2015-11-02 17:26:28 -05:00
Rob Rix	700e2a84a1	Return ranges out when computing term strings.	2015-11-02 17:26:23 -05:00
Rob Rix	3c3bbc3cb9	Copy out term leaf ranges.	2015-11-02 17:24:22 -05:00
Rob Rix	975cfb427c	Stub in stringification of terms.	2015-11-02 17:22:39 -05:00
Rob Rix	ae5b50bcdf	CofreeType.cata’s transformation block receives the annotation.	2015-11-02 17:22:24 -05:00
Rob Rix	ed9ca09909	Duplicate cata for CofreeType.	2015-11-02 17:20:42 -05:00
Rob Rix	4f03d5355b	🔥 Free.para.	2015-11-02 17:18:56 -05:00
Rob Rix	43100a0432	Sort keyed elements by fiat	2015-11-02 17:15:39 -05:00
Rob Rix	2ca27681aa	Pass both strings to Patch stringification.	2015-11-02 17:15:27 -05:00
joshvera	b19e995ae2	fix some commas	2015-11-02 17:03:59 -05:00
joshvera	306badf972	Compare both elements if neither are invisible	2015-11-02 16:27:14 -05:00
Rob Rix	523d7a441e	Use the context-printing function for indexed syntax.	2015-11-02 16:15:34 -05:00
Rob Rix	d015f972ae	Use the new context printing function for fixed syntax.	2015-11-02 16:15:13 -05:00
Rob Rix	7ac4c9ee03	Add a private function to splat out context.	2015-11-02 16:14:03 -05:00
Rob Rix	b858c164d8	Term printing is private.	2015-11-02 16:11:55 -05:00
Rob Rix	1027f6b67f	Use accurate ranges where possible.	2015-11-02 16:07:57 -05:00
Rob Rix	144f6ba2c2	Ranges can be nil.	2015-11-02 16:07:34 -05:00
Rob Rix	44dbf62d7c	Print and benchmark the diff.	2015-11-02 16:03:09 -05:00
Rob Rix	4fe901bbd4	Remove the switch statement.	2015-11-02 16:03:03 -05:00
Rob Rix	6f2176ca57	Compute the unified diff as a catamorphism.	2015-11-02 16:02:58 -05:00
Rob Rix	9959c231aa	Stub in a function to compute the range of a patch.	2015-11-02 16:02:23 -05:00
joshvera	c3a2e50baf	beginningOfNextElement should be a non-invisible element	2015-11-02 15:56:12 -05:00
joshvera	7331e387ff	insert separators before invisible elements	2015-11-02 15:39:04 -05:00
Rob Rix	3fbfeccce9	Free.para’s transformation function receives the annotation.	2015-11-02 15:12:27 -05:00
Rob Rix	aa815e8010	Free.cata’s transformation function receives the annotation.	2015-11-02 15:09:53 -05:00
Rob Rix	5aef08e4c5	Paramorphism over Free.	2015-11-02 14:33:02 -05:00
Rob Rix	3d5b0115b2	Extract Patch stringification into a separate function.	2015-11-02 14:21:34 -05:00
Rob Rix	a7dec6be3b	Use the Diff typealias.	2015-11-02 14:19:10 -05:00
Rob Rix	b1f1e29c13	Add a typealias for diffs.	2015-11-02 14:18:30 -05:00
Rob Rix	389636ffbc	Stub in printing of patches.	2015-11-02 14:14:19 -05:00
Rob Rix	c14a46b96f	unified takes before/after strings.	2015-11-02 14:08:20 -05:00
Rob Rix	683f6557ac	Stub in a function which pretty-prints unified diffs.	2015-11-02 14:04:48 -05:00
Rob Rix	bbce3bc4e3	Add the --unified flag (temporarily at least).	2015-11-02 13:21:10 -05:00
Rob Rix	e4310be948	Only compute the JSON &c. for split diffs.	2015-11-02 13:20:42 -05:00
Rob Rix	ec87b3b17f	Remove the rest property.	2015-11-02 13:07:33 -05:00
Rob Rix	dc4b9188f1	Return the first output we find.	2015-11-02 13:07:24 -05:00
Rob Rix	202bc2b31b	We’ll always have a pair of sources.	2015-11-02 13:06:23 -05:00
Rob Rix	b9f739844f	Arguments are expected to contain pairs of sources.	2015-11-02 13:04:48 -05:00
Rob Rix	e766a97995	Default to split diffs in the parser.	2015-11-02 12:57:41 -05:00
Rob Rix	39fbf3c828	Don’t pass the debug document versioning parameter.	2015-11-02 12:51:59 -05:00
Rob Rix	ebaa40b587	Ignore the first path.	2015-11-02 12:50:34 -05:00
Rob Rix	6d2729944d	Use the parser to get our sources out.	2015-11-02 12:48:21 -05:00
Rob Rix	58041d7b6e	Bump Stream for a bump to Either.	2015-11-02 12:46:02 -05:00
joshvera	d9cb6594ac	Merge remote-tracking branch 'origin/master' into show-empty-space	2015-11-02 12:29:44 -05:00
Rob Rix	d5e480a1c9	Compute the effective output to use.	2015-11-02 12:07:38 -05:00
Rob Rix	d17b6e93e4	Docs.	2015-11-02 12:04:09 -05:00
Rob Rix	ac15948fd9	Argument.rest is private.	2015-11-02 12:03:51 -05:00
Rob Rix	cb67d79dea	Parse finite lists.	2015-11-02 12:03:16 -05:00
Rob Rix	5926ff63ff	Parse an infinite list of flags and sources.	2015-11-02 12:03:08 -05:00
Rob Rix	77b43876de	Parse an infinite list of flags.	2015-11-02 12:01:33 -05:00
Rob Rix	7b9e6e778f	Stub in a source parser. ... This currently asserts the lack of errors, which we’ll have to correct. I just don’t know what the right pattern for that should be.	2015-11-02 12:00:11 -05:00
Rob Rix	feaa4e3855	Parse a flag.	2015-11-02 11:55:04 -05:00
Rob Rix	14ce019752	Add a parser for flags.	2015-11-02 11:51:13 -05:00
Rob Rix	c36198a6f4	Add a set of flags we can parse.	2015-11-02 11:46:57 -05:00
Rob Rix	2a0ceebd97	Add an output flag.	2015-11-02 11:44:52 -05:00
Rob Rix	7083424567	Add an output type.	2015-11-02 11:44:42 -05:00
Rob Rix	2146d75c14	Use rest to compute the remainder of the files.	2015-11-02 11:44:30 -05:00
Rob Rix	8292d597f4	Compute the tail of the argument list.	2015-11-02 11:44:18 -05:00
Rob Rix	ba42033f09	Retrieve the array of files.	2015-11-02 11:37:54 -05:00
Rob Rix	1e3ab7aeeb	Arguments are a linked list.	2015-11-02 11:36:52 -05:00
Rob Rix	f83bbf95d8	Arguments can be sources.	2015-11-02 11:36:20 -05:00
Rob Rix	e955c61de9	Stub in an arguments parser.	2015-11-02 11:35:41 -05:00
Rob Rix	4c75a79d05	Stub in an Argument type.	2015-11-02 11:35:32 -05:00
Rob Rix	4b295c1c3f	Correct the line range.	2015-10-30 18:16:46 -04:00
Rob Rix	c1d85ae7ef	Fall back to line by line diffing.	2015-10-30 18:15:16 -04:00
Rob Rix	214c3cb2b4	Add a function parsing an input string into its component lines.	2015-10-30 18:13:22 -04:00
Rob Rix	0be29f8eff	Remove the doubt-json folder.	2015-10-30 17:53:55 -04:00
Rob Rix	becbc868c2	Move the JSON fixtures.	2015-10-30 17:53:46 -04:00
Rob Rix	e679f1e434	Remove the sources from the project.	2015-10-30 17:53:06 -04:00
Rob Rix	7b4c3df48e	Remove the doubt-json target.	2015-10-30 17:52:23 -04:00
Rob Rix	cfe655c42e	NSURL(string:) “succeeds” with paths, but makes broken URLs.	2015-10-30 17:49:59 -04:00
Rob Rix	67dae454f0	Path extensions can be non-nil and empty.	2015-10-30 17:25:19 -04:00
Rob Rix	49f8e54409	Use a computed property.	2015-10-30 17:21:47 -04:00
Rob Rix	ec579b2053	Allow the fragment to specify a type.	2015-10-30 17:16:02 -04:00
Rob Rix	ff760d67b3	Remove the Term/Diff typealiases.	2015-10-30 14:57:33 -04:00
Rob Rix	8fadcd3d95	JSONLeaf doesn’t need to import Foundation.	2015-10-30 14:57:10 -04:00
Rob Rix	62cb428ea6	Parse JSON with the JSON parser.	2015-10-30 14:56:38 -04:00
Rob Rix	4bd9a4d600	Use a switch statement.	2015-10-30 14:56:18 -04:00
Rob Rix	9476deb5d6	Convert CofreeJSON to Term.	2015-10-30 14:56:05 -04:00
Rob Rix	1850fdeeb6	Just take categories directly.	2015-10-30 14:55:02 -04:00
Rob Rix	4e79596773	Use the JSONLeaf categories.	2015-10-30 14:54:23 -04:00
Rob Rix	9f9b7e1517	JSONLeaf is Categorizable.	2015-10-30 14:54:18 -04:00
Rob Rix	13a872d477	Add an Info constructor from ranges/JSON leaves.	2015-10-30 14:52:22 -04:00
Rob Rix	28e417e1c4	Make the implicit constructor explicit.	2015-10-30 14:49:15 -04:00
Rob Rix	a4c6a6ce6d	Remove the test examples.	2015-10-30 13:59:39 -04:00
Rob Rix	1ce9b60e2e	Copy benchmarking in from doubt-json.	2015-10-30 13:59:22 -04:00
Rob Rix	40570c639c	Use the parser function.	2015-10-30 13:58:43 -04:00
Rob Rix	d1d59c61ac	Abstract a function to select the parser.	2015-10-30 13:58:19 -04:00