439 Commits

Author	SHA1	Message	Date
Tom Alexander	2def475337	Move the structs into the token module.	2022-12-18 03:24:35 -05:00
Tom Alexander	8211e1043f	Move in_section to a util module.	2022-12-18 03:18:43 -05:00
Tom Alexander	6404e5f50e	Cleanup	2022-12-18 03:15:11 -05:00
Tom Alexander	4ac3a47deb	Move the text element parser into the text module.	2022-12-18 03:15:11 -05:00
Tom Alexander	46672b40b2	Cleanup.	2022-12-18 03:04:31 -05:00
Tom Alexander	54ed989300	Move Res into the error type module.	2022-12-18 03:04:31 -05:00
Tom Alexander	a005502d97	Move another function inside bold that was only used by bold.	2022-12-18 02:55:14 -05:00
Tom Alexander	eaf8721ae9	Move paragraph to its own module.	2022-12-18 02:53:26 -05:00
Tom Alexander	7fc19cc9a6	Rename the parser for bold and link.	2022-12-18 02:39:29 -05:00
Tom Alexander	58f2f4e6aa	Move link to its own module.	2022-12-18 02:37:42 -05:00
Tom Alexander	0b35491047	Move bold out to its own module.	2022-12-18 02:30:24 -05:00
Tom Alexander	6352f92ebc	Rename nom context to parser context.	2022-12-18 02:16:28 -05:00
Tom Alexander	6caaeddc37	Update link to use the new contextual combinators like bold.	2022-12-18 02:05:21 -05:00
Tom Alexander	9eab737aa8	Add comment.	2022-12-16 01:39:57 -05:00
Tom Alexander	1da38c8f7d	Use context_many1 for paragraphs in a document.	2022-12-16 01:35:49 -05:00
Tom Alexander	601fc4776a	Have to rework the paragraph parser to return something that I'd want to put in a token, like a Paragraph struct.	2022-12-16 00:53:29 -05:00
Tom Alexander	6459cc64d0	I think thats all for context_many1. Just need to start using it.	2022-12-16 00:47:33 -05:00
Tom Alexander	1f1a18782e	Start of many1.	2022-12-16 00:21:13 -05:00
Tom Alexander	0504c48b66	Implement an iter_until.	2022-12-15 23:52:52 -05:00
Tom Alexander	0d2dfe3a14	Move context_many_till to its own combinators file.	2022-12-15 23:28:09 -05:00
Tom Alexander	c74b802038	Cleanup.	2022-12-15 23:23:03 -05:00
Tom Alexander	cd2daf6fef	Replace all TODOs wanting a custom error with a generic custom error.	2022-12-15 23:15:27 -05:00
Tom Alexander	a1adf2aa41	Custom error seems to be working.	2022-12-15 23:09:40 -05:00
Tom Alexander	f2e68612c4	Create a custom error enum to contain regular nom errors.	2022-12-15 22:57:08 -05:00
Tom Alexander	4a9bb31aed	Start of a custom error.	2022-12-15 22:38:28 -05:00
Tom Alexander	4c09c390fa	Prevent bold inside bold.	2022-12-15 21:57:21 -05:00
Tom Alexander	c6f75e1736	Don't increment Rc counters when checking exit matchers.	2022-12-15 21:30:53 -05:00
Tom Alexander	4af09a69a1	Rename fail matcher to exit matcher.	2022-12-15 21:24:53 -05:00
Tom Alexander	0c676c44c2	I need to prevent matching bold inside a bold.	2022-12-15 21:14:49 -05:00
Tom Alexander	b27be8eab1	Pass context into fail matchers.	2022-12-15 20:33:52 -05:00
Tom Alexander	23e567ca93	Add a comment with a note about what my next step is.	2022-12-11 02:31:14 -05:00
Tom Alexander	50a57ef15b	Check that there is blank space after the ending asterisk.	2022-12-11 02:24:19 -05:00
Tom Alexander	bb09ed41a4	Deciding if bold can start.	2022-12-11 02:07:12 -05:00
Tom Alexander	b6b88a7d78	Switch to using borrows instead of cloning the Rc during iteration.	2022-12-11 01:07:16 -05:00
Tom Alexander	cfdcb7408a	Implement iterator with far too many clones.	2022-12-11 01:04:51 -05:00
Tom Alexander	0bcc3d9dc6	Borrow the context instead of clone it for fewer reference count increments.	2022-12-11 00:39:35 -05:00
Tom Alexander	9dfca22b86	Switch to a contextual bold start function.	2022-12-11 00:36:59 -05:00
Tom Alexander	88bf1b3d8b	Update flat_bold to context_many_till.	2022-12-11 00:33:40 -05:00
Tom Alexander	972ffa6345	Add start of paragraph context.	2022-12-11 00:21:30 -05:00
Tom Alexander	b2742f89e2	Cleaning up.	2022-12-11 00:13:19 -05:00
Tom Alexander	103dcbea35	Add an assert.	2022-12-11 00:08:39 -05:00
Tom Alexander	7cb85fc8af	Implement two todo!()s.	2022-12-11 00:02:13 -05:00
Tom Alexander	fa1d845b76	Reverse the element order.	2022-12-10 23:57:39 -05:00
Tom Alexander	0aa8926d6b	OMFG it built.	2022-12-10 23:51:04 -05:00
Tom Alexander	7d40b8ae24	Attempt to put two lifetimes in the context.	2022-12-10 23:49:02 -05:00
Tom Alexander	75ab876b0b	Its building again.	2022-12-10 23:38:19 -05:00
Tom Alexander	7bed61a541	Lets try not digging into return type O.	2022-12-10 23:11:52 -05:00
Tom Alexander	a86ece4d02	Going down to one lifetime.	2022-12-10 22:57:30 -05:00
Tom Alexander	43fddc6e58	Re-adding 'r allowed me to remove dependency but adding in return tokens broke the build again.	2022-12-10 22:56:03 -05:00
Tom Alexander	24a8247907	Got rid of the 'r lifetimes without issue.	2022-12-10 22:31:28 -05:00
Tom Alexander	5b645c67e5	Uhhh fixed it by setting r to outlive x. I Don't know if that was correct.	2022-12-10 22:25:54 -05:00
Tom Alexander	ea63793b36	Start of attempt to return tokens.	2022-12-10 22:24:12 -05:00
Tom Alexander	a88117f731	Type issue with returning the elements.	2022-12-10 22:20:29 -05:00
Tom Alexander	2a595e2b6c	Implement ptr_eq on the context types.	2022-12-10 22:04:39 -05:00
Tom Alexander	7ba863118f	Only require a mutable borrow by using option's take().	2022-12-10 21:36:22 -05:00
Tom Alexander	bb4b045aa8	pop_front implemented.	2022-12-10 21:27:33 -05:00
Tom Alexander	5899bde66e	Add comment of what I need to do.	2022-12-10 21:10:37 -05:00
Tom Alexander	1efe2efc41	Using many_elem twice is breaking the build.	2022-12-10 20:58:58 -05:00
Tom Alexander	95a043deef	Huh, managed to solve the lifetime issue using HRTB. Not sure if I should be changing the 'r at the end of the line.	2022-12-10 20:56:06 -05:00
Tom Alexander	e222b5a9df	Maybe we should switch to an owned context.	2022-12-10 20:53:37 -05:00
Tom Alexander	396813c70a	Two uses of context tree.	2022-12-04 00:53:59 -05:00
Tom Alexander	fb8a31a88f	I think I solved the clone issue by manually implementing clone since the Rc needs to be cloned, not the content inside it.	2022-12-04 00:04:39 -05:00
Tom Alexander	2db400198e	Going to try removing clone from the tokens.	2022-12-04 00:04:38 -05:00
Tom Alexander	b20568c09e	Clone issue.	2022-12-04 00:04:38 -05:00
Tom Alexander	96aca6b537	Switching to a new context variable.	2022-12-04 00:04:38 -05:00
Tom Alexander	c568920da8	Cleanup.	2022-12-04 00:04:38 -05:00
Tom Alexander	b15f299de8	Blindly followed the compiler's advice and it solved the build error.	2022-12-04 00:04:38 -05:00
Tom Alexander	8ae942a6fc	Remove unnecessary dynamic dispatch.	2022-12-04 00:04:38 -05:00
Tom Alexander	b17429e05c	Remove unnecessary wrapping.	2022-12-04 00:04:38 -05:00
Tom Alexander	ff65776607	Weird lifetime issue.	2022-12-04 00:04:37 -05:00
Tom Alexander	11cf24a500	Trying to switch to unbound matchers.	2022-12-04 00:04:37 -05:00
Tom Alexander	05b3ac1725	Starting an unbound matcher type to allow unbound matchers as parameters to context_many_till.	2022-12-04 00:04:37 -05:00
Tom Alexander	6cfc39ca45	Replace the old nom_context with the contents of new_context.	2022-12-04 00:04:37 -05:00
Tom Alexander	84fa1c3aae	Impleemnt the behavior for check_fail_matcher.	2022-12-04 00:04:37 -05:00
Tom Alexander	1a7bfd23f1	Implement the structure to the check_fail_matcher function.	2022-12-04 00:04:37 -05:00
Tom Alexander	13ee93f31c	It is building again.	2022-12-04 00:04:37 -05:00
Tom Alexander	83881e55b5	Omg lifetimes errors.	2022-12-04 00:04:36 -05:00
Tom Alexander	dff528da32	Implement clone for the context.	2022-12-04 00:04:36 -05:00
Tom Alexander	b91e4df797	Switch to a centrally-defined context type.	2022-12-04 00:04:36 -05:00
Tom Alexander	a3286b2542	Running into a FnOnce vs FnMut error.	2022-12-04 00:04:36 -05:00
Tom Alexander	bc91775880	Add the with_additional_node function to the ContextTree.	2022-12-04 00:04:36 -05:00
Tom Alexander	c0e51298b6	Port a lot of the function signatures over.	2022-12-04 00:04:36 -05:00
Tom Alexander	bdf3c98f34	Starting to move the org-mode specific context tree stuff over.	2022-12-03 20:47:31 -05:00
Tom Alexander	89148a623c	Move the list to its own file.	2022-12-03 20:38:56 -05:00
Tom Alexander	170ddec9a9	Starting a new context tree.	2022-12-03 20:30:03 -05:00
Tom Alexander	b9034147a6	wip	2022-12-03 19:38:04 -05:00
Tom Alexander	8608136124	Removed one wrapper.	2022-11-27 00:35:38 -05:00
Tom Alexander	7d25628f74	Same lifetime issue.	2022-11-27 00:21:34 -05:00
Tom Alexander	ec4078c812	Add a blank check_fail_matcher implementation.	2022-11-27 00:14:23 -05:00
Tom Alexander	15dedc8ee9	Add with_additional_fail_matcher.	2022-11-27 00:12:33 -05:00
Tom Alexander	a55b7c42fd	maybe working with dynamic dispatch.	2022-11-27 00:07:43 -05:00
Tom Alexander	a08fab1a8d	Remove hrtb attempt.	2022-11-27 00:02:57 -05:00
Tom Alexander	b8e3074a0e	with addition node not working.	2022-11-27 00:01:05 -05:00
Tom Alexander	7346f5e850	hrtb not working.	2022-11-26 23:56:03 -05:00
Tom Alexander	9673917a3c	get_fail_matcher implemented.	2022-11-26 23:35:10 -05:00
Tom Alexander	4a2b633f9c	Added traits for nodes and context elements.	2022-11-26 23:12:53 -05:00
Tom Alexander	f93f1c5950	Going to attempt the tree one more time.	2022-11-26 22:57:05 -05:00
Tom Alexander	2bb6f50cba	Start of working on enum.	2022-11-26 22:54:54 -05:00
Tom Alexander	f4473cbf01	Remove the new context tree implementation.	2022-11-26 22:37:00 -05:00
Tom Alexander	6e2ff8b870	Revert "Migrating to the new context tree." ... This reverts commit c37008df1d41c36780c57054c3d0e0244478c8d5.	2022-11-26 22:36:02 -05:00
Tom Alexander	29add885f3	Revert "with_additional_fail_matcher is not going to work due to lifetimes with the new forced borrow." ... This reverts commit 1d9fb42b6214bd922ac99ea23c1b80b756055128.	2022-11-26 22:36:00 -05:00
Tom Alexander	8659a1083e	Revert "I may need to switch to boxes." ... This reverts commit bdc61c075716e1752eb1332ce8e2682f69b2e435.	2022-11-26 22:35:53 -05:00
Tom Alexander	c2bd6e23c6	I may need to switch to boxes.	2022-11-26 22:20:30 -05:00
Tom Alexander	0b2acd7e54	with_additional_fail_matcher is not going to work due to lifetimes with the new forced borrow.	2022-11-26 22:08:17 -05:00
Tom Alexander	e8b44f27e8	Migrating to the new context tree.	2022-11-26 22:03:15 -05:00
Tom Alexander	f0de041710	Make the fail matcher code in the new context tree work.	2022-11-26 21:55:33 -05:00
Tom Alexander	8abf194a12	Getting weird errors from the not()s.	2022-11-26 21:47:57 -05:00
Tom Alexander	67e95a0adc	Remove unnecessary pubs.	2022-11-26 21:28:57 -05:00
Tom Alexander	f645b0cb75	Make the node type inside the ContextTree generic but the implementation still explicitly uses dyn OrgModeContext.	2022-11-26 21:07:56 -05:00
Tom Alexander	e888c0e66f	Make the node type generic.	2022-11-26 21:02:52 -05:00
Tom Alexander	7a241353b5	New heterogeneous context tree seems to be working.	2022-11-26 20:41:37 -05:00
Tom Alexander	d9f0eda5b7	many_till ignoring context.	2022-11-26 19:54:46 -05:00
Tom Alexander	c1778a4f12	Switching to generics.	2022-11-26 19:46:59 -05:00
Tom Alexander	0fb523e0fe	mut didn't help.	2022-11-26 19:41:33 -05:00
Tom Alexander	d3b49a6835	Urg hrtb hell again.	2022-11-26 19:39:00 -05:00
Tom Alexander	45904044e3	Starting to write my own many_till with context.	2022-11-26 19:35:02 -05:00
Tom Alexander	4d58ed3bea	Re-arrange context parameter order.	2022-11-26 19:26:48 -05:00
Tom Alexander	29a53044ea	Rename OrgModeContext.	2022-11-26 19:22:14 -05:00
Tom Alexander	77f02a21b9	Move the document parser inside text_element_parser. ... This is to put the context-sensitive parsers together during this early development stage.	2022-11-26 19:15:43 -05:00
Tom Alexander	a09c6838b3	Remove existing trace calls.	2022-11-26 18:27:36 -05:00
Tom Alexander	99f9450eda	Clean up paragraph eof detection.	2022-11-26 18:25:53 -05:00
Tom Alexander	65c51f79d6	Update the paragraph parser to work at the end of the file.	2022-11-26 18:22:41 -05:00
Tom Alexander	185c761a5d	Move the paragraph context into the paragraph parser.	2022-11-26 17:51:07 -05:00
Tom Alexander	c312673f12	Make the types more consistent.	2022-11-25 18:55:56 -05:00
Tom Alexander	cc41074563	It seems to be working now that I've integrated links.	2022-11-25 18:40:38 -05:00
Tom Alexander	5b306729f5	Remove instrumentation.	2022-11-25 18:37:12 -05:00
Tom Alexander	e215fd35ca	I was double-matching the bold end.	2022-11-25 18:35:21 -05:00
Tom Alexander	9c54689bd9	Bold not getting detected.	2022-11-25 18:23:51 -05:00
Tom Alexander	cdb35edd64	Trace span events.	2022-11-25 17:55:11 -05:00
Tom Alexander	1fcb32d3c6	Explicitly set settings for the tracing subscriber.	2022-11-25 17:49:38 -05:00
Tom Alexander	e0a9c49e9f	Switch to using tracing instead of logging.	2022-11-25 17:27:29 -05:00
Tom Alexander	6aa656127e	Structurally this should be working but bold is not being captured.	2022-11-25 13:55:09 -05:00
Tom Alexander	f84fa09871	Match fail logic implemented.	2022-11-24 16:24:49 -05:00
Tom Alexander	109a013057	Starting to implement the match_fail function to walk up the matcher chain.	2022-11-24 16:01:52 -05:00
Tom Alexander	d277a033c9	Passing the context around.	2022-11-24 15:40:07 -05:00
Tom Alexander	a792acf4b0	Constructing a context.	2022-11-24 15:14:53 -05:00
Tom Alexander	1b8dada135	Rename list to context tree.	2022-11-24 15:10:13 -05:00
Tom Alexander	7976e017fd	Store the node in the list.	2022-11-24 15:08:43 -05:00
Tom Alexander	8dcb1318d6	Working by exposing the node type.	2022-11-24 15:06:07 -05:00
Tom Alexander	f2ddf6451c	Mutable push.	2022-11-24 14:59:37 -05:00
Tom Alexander	1487f7d96b	Really start from scratch.	2022-11-24 14:42:05 -05:00
Tom Alexander	6f416f6997	Going to switch to using immutable fn instead of FnMut so I can easily make a context tree.	2022-11-24 14:31:58 -05:00
Tom Alexander	806070169a	Nope.	2022-10-30 05:54:51 -04:00
Tom Alexander	58e31aa841	Did lifetimes fix it?	2022-10-30 05:53:18 -04:00
Tom Alexander	7eb8087f9d	Cleanup	2022-10-30 05:48:43 -04:00
Tom Alexander	d1460fed95	For some reason it does not work with FnMut for additional fail matchers.	2022-10-30 05:43:26 -04:00
Tom Alexander	661ccfb30c	Not general enough error.	2022-10-30 05:09:01 -04:00
Tom Alexander	8695d32f40	Swap in the new TestContext everywhere.	2022-10-30 05:06:06 -04:00
Tom Alexander	ec2d09b72a	Switch to Rc to fix the multiple references issue.	2022-10-30 04:57:22 -04:00
Tom Alexander	ce4b4a27f9	How do I do parent? Maybe Rc Instead of Box.	2022-10-30 04:50:09 -04:00
Tom Alexander	13c83d9d85	Comment out line causing build problems so we can see if we introduce new build problems.	2022-10-30 03:49:50 -04:00
Tom Alexander	0c77951ecc	rename lifetimes.	2022-10-15 17:48:27 -04:00
Tom Alexander	30042ddcfe	Lifetime issue not general enough.	2022-10-15 14:28:24 -04:00
Tom Alexander	1d571acc17	Add accessors for booleans on what we are allowed to match.	2022-10-15 14:20:40 -04:00
Tom Alexander	9d534aa627	Add paragraph parser.	2022-10-15 14:16:52 -04:00
Tom Alexander	ba25f5b5ca	Start of flat text element, not handling more complex types like bold and link.	2022-10-15 14:04:24 -04:00
Tom Alexander	30d6648590	Implement logic for checking the fail matchers without keeping mutable borrows open for longer than the execution of that function.	2022-10-15 00:39:32 -04:00
Tom Alexander	6b93e1c007	Lifetime issue.	2022-10-15 00:01:37 -04:00
Tom Alexander	8a6868f299	Added boxes.	2022-10-14 20:52:49 -04:00
Tom Alexander	9e3ea29634	I think I need a box.	2022-10-14 20:50:00 -04:00
Tom Alexander	add717071c	Using a mutable reference breaks clone.	2022-10-14 20:25:10 -04:00
Tom Alexander	112aba3137	Adding lifetimes.	2022-10-14 20:17:48 -04:00
Tom Alexander	0cd3300444	Using trait objects seems good so far.	2022-10-14 20:09:09 -04:00
Tom Alexander	262bd3c061	Going to try to make the functions in the context more generic.	2022-10-14 20:06:10 -04:00
Tom Alexander	c958136949	Looking at this again with fresh eyes. ... Going to remove the broken stuff to start with a simpler state.	2022-10-14 19:51:13 -04:00
Tom Alexander	d23f7ce7fe	Inlining did not fix it.	2022-07-17 19:04:55 -04:00
Tom Alexander	c5d255d357	Recursion limit.	2022-07-17 19:01:21 -04:00
Tom Alexander	70688c8d51	Pass context into paragraph from document instead of generating the initial context at paragraph level.	2022-07-17 18:40:05 -04:00
Tom Alexander	e5af567981	Switch to using with_additional_fail_matcher.	2022-07-17 18:22:40 -04:00
Tom Alexander	cad8f4bd77	Does not need to consume the NomContext since we are cloning the fail matcher.	2022-07-17 18:20:18 -04:00
Tom Alexander	804c8fd0b7	Cleaner implementation.	2022-07-17 18:19:03 -04:00
Tom Alexander	1506a86d97	I think I finally got with_additional_fail_matcher building.	2022-07-17 18:17:41 -04:00
Tom Alexander	8321c071e4	Working now that we use clone and manually instantiate it.	2022-07-17 18:06:14 -04:00
Tom Alexander	3519c76c61	Lifetime issue.	2022-07-17 17:29:24 -04:00
Tom Alexander	c88a5305ad	Cautiously hopeful this might work.	2022-07-16 21:55:33 -04:00
Tom Alexander	b3b2874cc2	Cleaning up.	2022-07-16 21:37:08 -04:00
Tom Alexander	8357837571	Hmmm it seems to be building.	2022-07-16 21:32:23 -04:00
Tom Alexander	99b19410c5	Maybe nested closures in a macro could work since they're typeless.	2022-07-16 21:22:03 -04:00
Tom Alexander	9d8fddb44d	Going to go back to fn objects in the hope that I don't have to specify lifetimes.	2022-07-16 21:16:34 -04:00
Tom Alexander	5c39a6a7bf	Lifetime issue.	2022-07-16 20:45:38 -04:00
Tom Alexander	c67de70363	Going to try flatly defined functions and wrap them.	2022-07-16 20:42:56 -04:00
Tom Alexander	fdd5b532fc	Expose a document parser and implement the paragraph parser so something is hitting our macro.	2022-07-16 18:26:53 -04:00
Tom Alexander	040671b98f	Woah, it builds.	2022-07-16 18:18:41 -04:00
Tom Alexander	83c5a545e0	Deleting some extra parsers that I'll need later but they're just in the way right now.	2022-07-16 18:12:52 -04:00
Tom Alexander	981eeb5326	Maybe I need to hard-code types.	2022-07-16 18:09:43 -04:00
Tom Alexander	7e07e00e4c	Trying a raw borrow with explicit lifetime.	2022-07-16 17:52:04 -04:00
Tom Alexander	091b70dff6	Going to try boxing.	2022-07-16 17:27:08 -04:00
Tom Alexander	b4215128fa	Compiling but I'm not generating a new context.	2022-07-16 16:31:00 -04:00
Tom Alexander	ee9e6297a6	Initial setup for the parser.	2022-07-16 14:17:33 -04:00