Tom Alexander
9e4bf553d3
First attempt at implementing drawers.
2023-04-15 17:56:07 -04:00
Tom Alexander
1f7c24545b
Initial structure for drawer.
2023-04-15 17:36:07 -04:00
Tom Alexander
50d05b99be
Require space after hash in comment if comment line is not empty.
2023-04-15 17:08:22 -04:00
Tom Alexander
6e4aa38fce
Add test demonstrating problem.
2023-04-15 17:04:47 -04:00
Tom Alexander
4e460e4a8c
Consume line ending in comments.
2023-04-15 16:59:30 -04:00
Tom Alexander
33bc1af17d
First stab at implementing comments.
2023-04-15 16:53:58 -04:00
Tom Alexander
d1a7d0b835
Show that trailing whitespace belongs to comments.
2023-04-15 16:37:25 -04:00
Tom Alexander
26e0ad5800
Add an example exploring indentation with comments.
2023-04-15 16:36:11 -04:00
Tom Alexander
1b10b197f2
Initial structure for adding support for comments.
2023-04-15 16:31:38 -04:00
Tom Alexander
412bdcda28
Fix problem with detecting end of plain list item.
...
The problem is line indented lte does not match because we aren't consuming the whitespace that the plain list would consume.
2023-04-14 23:56:55 -04:00
Tom Alexander
be64eb92af
Ran into a bigger issue.
2023-04-14 20:17:53 -04:00
Tom Alexander
8549a6b0db
Fix case where indentation was causing the plain list item matcher to match items it wouldn't use in other parts.
2023-04-14 19:56:54 -04:00
Tom Alexander
143ac49777
Fix plain list item parser to not consume trailing whitespace on the last element.
2023-04-14 19:32:08 -04:00
Tom Alexander
08fed1301e
Fix plain list parser to not consume trailing whitespace on the last item.
2023-04-14 19:24:05 -04:00
Tom Alexander
665c1d70fb
Add a test case demonstrating an issue.
2023-04-12 15:24:18 -04:00
Tom Alexander
05c9ec86b8
Compare plain list items inside plain lists.
2023-04-12 14:07:33 -04:00
Tom Alexander
57f56eb860
Compare footnote definition and greater block bounds.
2023-04-12 13:45:22 -04:00
Tom Alexander
ba9ef7907f
Add a test proving that nested lists are exited by two blank lines.
2023-04-12 13:21:31 -04:00
Tom Alexander
75a47deedd
Compare plain list bounds.
2023-04-12 13:16:25 -04:00
Tom Alexander
f27965001d
End plain lists when there are two blank lines.
2023-04-12 13:09:44 -04:00
Tom Alexander
2a601475fd
Compare children of sections.
2023-04-12 11:46:49 -04:00
Tom Alexander
c4e6549feb
Compare children of heading.
2023-04-12 11:35:02 -04:00
Tom Alexander
4dbf8b9c69
Capture the trailing whitespace for the file as regular trailing whitespace for elements.
...
This makes our ranges for sections and headlines match up with the emacs org-mode parser for the example at org_mode_samples/sections_and_headings/sections_and_headings.org.
2023-04-12 11:17:21 -04:00
Tom Alexander
52b401d548
comparing begin and end offsets for top-level sections and headlines.
2023-04-11 19:16:04 -04:00
Tom Alexander
6e62bd5ff2
Initial return and printing of tree diff output.
2023-04-11 18:29:40 -04:00
Tom Alexander
287cc8dea3
Just barely starting to diff the two parsed forms.
2023-04-11 17:35:09 -04:00
Tom Alexander
1ecdd61fed
Do not consume trailing whitespace if the parent exit matcher is matching.
2023-04-10 13:13:11 -04:00
Tom Alexander
895ee9f3b6
Add a test showing the footnote exit matcher is not handling multiple blank lines properly.
2023-04-10 12:16:49 -04:00
Tom Alexander
6fdd613bed
Cleanup.
2023-04-10 12:13:31 -04:00
Tom Alexander
9c832053d4
Remove parent exit matcher check from section.
...
This was poorly thought out and causing exit due to the no exit error.
2023-04-10 12:08:03 -04:00
Tom Alexander
ea753ad33c
Fix footnote definition end matcher to use trailing whitespace.
2023-04-10 12:03:01 -04:00
Tom Alexander
6578ddc100
Add a test for footnote definition.
2023-04-10 11:54:05 -04:00
Tom Alexander
e5bc4cb14b
Footnote definitions are parsing on their own.
2023-04-10 11:50:43 -04:00
Tom Alexander
45db182421
Add comment about why we are not checking the parent exit matcher in paragraph.
2023-04-10 11:34:29 -04:00
Tom Alexander
df9265c2af
Updated paragraph to handle the new consumption of trailing whitespace.
2023-04-10 11:29:14 -04:00
Tom Alexander
e417e86bd4
Add a simple test for paragraphs.
2023-04-10 11:24:04 -04:00
Tom Alexander
204f319a92
Simplify headline_end and section_end now that eof is a special case.
2023-04-10 11:19:20 -04:00
Tom Alexander
cbe7ef4030
Update the section parser to handle the new whitespace-included element parsers.
2023-04-10 11:16:32 -04:00
Tom Alexander
54b0ff5036
Check for whitespace eof in exit matcher.
2023-04-10 10:50:42 -04:00
Tom Alexander
137815dbaf
Only use a local context when checking exit matchers.
...
This prevents context tree from deeper in the parse impacting exit checks for earlier in the parse. This is needed due to the trailing whitespace context element.
2023-04-10 10:49:28 -04:00
Tom Alexander
9a0172e1a4
Add a context element for tracking whether or not elements should consume their trailing whitespace.
2023-04-10 10:36:16 -04:00
Tom Alexander
6813c7c991
Identified the problem as being the handling of the trailing whitespace.
2023-04-10 09:49:24 -04:00
Tom Alexander
716f80b0ec
Add initial implementation of footnote definition.
2023-04-07 17:14:44 -04:00
Tom Alexander
42fca12e41
Add support for indenting greater blocks.
2023-04-07 16:18:13 -04:00
Tom Alexander
7023fb4617
Add a comment about a shortcoming.
2023-04-03 19:40:20 -04:00
Tom Alexander
d7f0a02bb8
Fix plain list ending with another element.
2023-04-03 19:30:17 -04:00
Tom Alexander
9257420c83
Add comment defining problem.
2023-04-03 19:19:33 -04:00
Tom Alexander
70225a668b
Do not match lesser blocks.
2023-04-03 18:38:35 -04:00
Tom Alexander
6e6ec56d1f
Basic implementation of greater block parser.
2023-04-03 18:33:07 -04:00
Tom Alexander
9e0bea4c3e
Starting the greater block source.
2023-04-03 17:36:56 -04:00
Tom Alexander
9ad428bb20
Standardize on the children name instead of contents.
2023-04-03 17:33:01 -04:00
Tom Alexander
11f127b545
Minor cleanup.
2023-04-03 17:25:30 -04:00
Tom Alexander
c7c922a4df
Do not allow plain lists to start with an asterisk with no indent.
2023-04-03 16:38:26 -04:00
Tom Alexander
b5b335b9b0
Fix handling of whitespace at the end of paragraphs and mandatory whitespace in list items.
2023-04-03 16:30:58 -04:00
Tom Alexander
2d1df18544
Cleanup.
2023-04-03 15:15:16 -04:00
Tom Alexander
2552ba28d1
Correctly parsing plain list items.
2023-04-03 15:06:12 -04:00
Tom Alexander
e681f8fdff
Remove the exit matcher block.
...
I'm not sure this is a problem, but while I'm debugging I want this removed to be safe.
2023-03-31 13:22:30 -04:00
Tom Alexander
2b0e88dc01
The current problem is plain_list_item_end is not taking into account depth.
2023-03-31 13:08:53 -04:00
Tom Alexander
68156f3667
Consume line break at the end of paragraph.
2023-03-31 11:42:04 -04:00
Tom Alexander
707eac5bf8
Move trailing whitespace parsing to a separate element.
...
I still need to parse the line break at the end of elements.
2023-03-31 11:16:37 -04:00
Tom Alexander
602cf4c374
Removing regurgitate calls.
...
This hacky solution ends up with whitespace getting captured twice so I will need to either use context or a separate parser.
2023-03-31 09:54:48 -04:00
Tom Alexander
775e703ade
Not sure whats going on.
2023-03-27 19:19:51 -04:00
Tom Alexander
9545990b52
Regurgitate seems to have made all text a paragraph.
2023-03-27 19:12:20 -04:00
Tom Alexander
3643f91bac
The current problem is whitespace at the end of a list item should not be consumed.
2023-03-27 18:50:25 -04:00
Tom Alexander
3d8fe253c9
Check for exit matcher between elements in a plain list item.
2023-03-27 18:22:08 -04:00
Tom Alexander
2c7a559869
Fix the line break consumption issue.
...
This leaves us with an issue of lists becoming needlessly nested.
2023-03-27 18:10:14 -04:00
Tom Alexander
028946ec90
Identified the problem.
...
The issue is plain text is eating the line break so paragraph is failing since it expects a line break at the end.
2023-03-27 18:08:17 -04:00
Tom Alexander
cddefdb963
Remove unnecessary exit matcher check.
2023-03-27 16:53:38 -04:00
Tom Alexander
a77d2655bd
Instrument the code.
2023-03-27 16:36:43 -04:00
Tom Alexander
22a2ed29f1
Integrate plain list parser into the parser tree.
2023-03-27 13:06:41 -04:00
Tom Alexander
81a9a754de
I seem to have solved the infinite loop issue by moving the exit check into the plain list parser.
2023-03-27 12:52:49 -04:00
Tom Alexander
188fdaacbc
Remove dead line of code.
2023-03-27 12:07:40 -04:00
Tom Alexander
d2923bfc0f
Add a special case exit matcher for end of file.
2023-03-25 14:45:35 -04:00
Tom Alexander
fc9d131740
Add basic test for plain list item.
2023-03-25 14:28:48 -04:00
Tom Alexander
422535fbe4
Wrote a plain list item parser.
2023-03-25 14:23:52 -04:00
Tom Alexander
e6752b9d83
Building the plain list item context.
2023-03-25 14:10:22 -04:00
Tom Alexander
4a863e92ff
Add a test case showing only paragraphs exist on the first line for plain lists.
2023-03-25 13:25:20 -04:00
Tom Alexander
ab09edb5de
Initial structures for plain lists.
2023-03-25 13:16:28 -04:00
Tom Alexander
74fc440cbd
Move parsers for specific objects/elements to their own files.
...
The parsers are the most complicated part, so I want them in their own files. I am uncertain if I want to move their corresponding structs or just the parsers.
2023-03-25 12:53:57 -04:00
Tom Alexander
5d9771c3b6
Move old modules out of the src tree.
2023-03-25 12:25:05 -04:00
Tom Alexander
23eb4d01f4
Add title to heading object.
2023-03-25 12:18:47 -04:00
Tom Alexander
e3f6dd497a
Test cases showing headings handling nesting properly.
2023-03-25 12:01:50 -04:00
Tom Alexander
3a0a4c8953
Consume the trailing whitespace after a headline.
2023-03-25 11:59:19 -04:00
Tom Alexander
b65c2f86b5
Consume trailing whitespace in paragraphs.
2023-03-25 11:50:15 -04:00
Tom Alexander
faf2bb401d
Fix plain text matcher exit conditions.
2023-03-25 11:40:12 -04:00
Tom Alexander
2ab407bb83
Invoke the document parser.
2023-03-25 11:27:38 -04:00
Tom Alexander
3c26933e7f
Move some functions into util.
2023-03-25 11:25:10 -04:00
Tom Alexander
d582c8603a
Implement a basic paragraph parser.
2023-03-25 11:22:59 -04:00
Tom Alexander
b88365e7eb
Wrote plain text parser.
2023-03-25 10:45:43 -04:00
Tom Alexander
f2d16d302a
Implement document parser.
2023-03-24 17:34:56 -04:00
Tom Alexander
7ab3df6938
Use headline instead of heading for section_end.
...
This should be more performant.
2023-03-24 17:30:33 -04:00
Tom Alexander
8013f127df
Implement heading parser.
2023-03-24 17:19:46 -04:00
Tom Alexander
dc9f3eb2e6
Implement the section parser.
2023-03-24 17:00:27 -04:00
Tom Alexander
754c1922df
Create a start_of_line parser.
2023-03-24 16:37:34 -04:00
Tom Alexander
ceb7788cfa
Check the exit matcher in more places.
2023-03-23 20:12:42 -04:00
Tom Alexander
3502a31b28
Simple version of the headline parser done.
2023-03-23 20:03:45 -04:00
Tom Alexander
4f10f2abec
Solved the lifetime issue by using the standard many1 combinator.
2023-03-23 20:00:35 -04:00
Tom Alexander
02d04b59db
Ran into a lifetime issue.
2023-03-23 19:53:20 -04:00
Tom Alexander
5c8a064eca
Start writing the parser for headings.
2023-03-23 19:35:32 -04:00
Tom Alexander
d3c804942f
Simplified context_many1 based on the assumption that we will not use previous element context elements.
2023-03-23 18:25:00 -04:00
Tom Alexander
ee60cf40dd
Disable building the old combinator.
2023-03-23 18:01:33 -04:00
Tom Alexander
6042c44514
Starting to define document parser.
2023-03-23 17:59:39 -04:00
Tom Alexander
d98a11059c
Introduce the document structure.
2023-03-23 17:52:16 -04:00
Tom Alexander
35d60c10ba
Define greater and lesser elements.
2023-03-23 17:26:07 -04:00
Tom Alexander
66befc66a9
Define regular link.
2023-03-23 17:02:08 -04:00
Tom Alexander
87c4a955af
Starting to define objects based on org-mode's definitions.
2023-03-23 16:49:52 -04:00
Tom Alexander
36210c2d7f
Add a DocumentRoot context element storing the original full document.
...
This might be used for look-behind instead of storing previous element nodes in the context tree.
2023-03-23 16:40:39 -04:00
Tom Alexander
f060e7189b
Minor cleanup.
2023-03-23 14:13:21 -04:00
Tom Alexander
cee12b7512
Allow IgnoreParent to be dead code.
2023-03-21 13:44:22 -04:00
Tom Alexander
77d8c5e029
Mark the plain list functions as allow dead code.
2023-03-21 13:38:23 -04:00
Tom Alexander
2fcb445fe9
Switch to ending plain lists with 2 blank lines instead of just 1.
2023-03-21 13:36:52 -04:00
Tom Alexander
e3f0aaefdf
Add TODO.
2023-03-19 18:28:59 -04:00
Tom Alexander
bf3464c65c
End list items when the following line is indented less than or equal to the current item.
2023-03-19 13:05:37 -04:00
Tom Alexander
6d19eeb0f4
Add parsers for lines that are indented less than or equal to the current line item's indent.
2023-03-18 17:32:07 -04:00
Tom Alexander
29904f2bb5
Detect next list item as ender for current list item.
2023-03-18 14:36:33 -04:00
Tom Alexander
88c974f8e4
Record the list item indent depth in the context tree.
2023-03-18 13:26:35 -04:00
Tom Alexander
32897270a5
Support leading whitespace for list items.
2023-03-18 13:26:32 -04:00
Tom Alexander
37070689c6
Continued work on item parser.
...
Still needs to:
1. Do context things
2. Fix the double-space after the tag separator issue
3. Add support for indentation
4. Write item_end
5. Write plain_list
2022-12-18 07:52:02 -05:00
Tom Alexander
5e7c891681
Start of list item implementation.
2022-12-18 07:52:02 -05:00
Tom Alexander
62e5499150
Add parsers for most of the rest of item.
2022-12-18 07:52:02 -05:00
Tom Alexander
b4e28f3d4d
Implement a parser for a bullet in a list item.
2022-12-18 07:52:02 -05:00
Tom Alexander
76b2325486
Start the plain list module.
2022-12-18 07:52:01 -05:00
Tom Alexander
f39319702c
Switch to nom's consumed.
2022-12-18 07:52:01 -05:00
Tom Alexander
89758721ed
Rename contents to source to match objects that need to store a separate source.
2022-12-18 04:42:13 -05:00
Tom Alexander
448dcfac72
Create an also_recognize combinator to make providing source slices fast and safe.
2022-12-18 04:36:12 -05:00
Tom Alexander
60d9487fdf
Add comment.
2022-12-18 04:36:12 -05:00
Tom Alexander
f7de564deb
Add a source trait to ensure we can re-create the source document using the parsed objects.
2022-12-18 04:36:12 -05:00
Tom Alexander
50a67c65ef
Standardize order of lifetimes for r and s.
2022-12-18 03:30:36 -05:00
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
