Skip to content

Markdown: improved version #3236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 2, 2022
Merged

Markdown: improved version #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e3d0c3
main: pass an extra arg to CB func called when a nesting-level is popped
masatake Dec 23, 2021
49ad552
Markdown: rewrite the parser in C
techee Dec 22, 2021
8b9b254
Markdown: Improve handling of underlined headings
techee Dec 24, 2021
aae0618
Markdown: Improve indentation detection
techee Dec 24, 2021
87d0d57
Markdown: Fix incorrectly detected underlines
techee Dec 25, 2021
bd8d8c4
Markdown: Ignore leading whitespaces when getting heading and detect \#
techee Dec 26, 2021
d0d780e
Markdown: Allow up to 3 whitespaces in front of first character like …
techee Dec 26, 2021
2460571
Markdown: Ignore preambule at file start between --- lines
techee Dec 26, 2021
35c6034
Markdown: Detect ending ``` on the same line
techee Dec 26, 2021
3ec4209
Markdown: Make sure quotes (starting with >) aren't used as headers w…
techee Dec 26, 2021
b1bd013
Markdown: Follow uctags formatting style
techee Dec 27, 2021
78320f2
Markdown: handle XML/HTML comments
techee Jan 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Units/parser-markdown.r/backquote.d/args.ctags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--sort=no
1 change: 1 addition & 0 deletions Units/parser-markdown.r/backquote.d/expected.tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A input.md /^# A$/;" c
3 changes: 3 additions & 0 deletions Units/parser-markdown.r/backquote.d/input.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
`O`
# A

1 change: 1 addition & 0 deletions Units/parser-markdown.r/frontmatter.d/input.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ tags: ['code','python']
menu:
main:
parent: 'code'
layout: default
---

# About this input
Expand Down
11 changes: 9 additions & 2 deletions Units/parser-markdown.r/simple-markdown.d/expected.tags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,17 @@ t input.md /^###### t #$/;" u l4subsection:h""k""o""q""s end:59 sectionMarker:##
u input.md /^###### u #######$/;" u l4subsection:h""k""o""q""s end:61 sectionMarker:##
A input.md /^A$/;" c end:64 sectionMarker:=
B input.md /^B$/;" c end:74 sectionMarker:=
C input.md /^C$/;" c end:105 sectionMarker:=
C input.md /^C$/;" c end:128 sectionMarker:=
D input.md /^D$/;" s chapter:C end:100 sectionMarker:-
E input.md /^E$/;" s chapter:C end:103 sectionMarker:-
F input.md /^F$/;" s chapter:C end:105 sectionMarker:-
F input.md /^F$/;" s chapter:C end:106 sectionMarker:-
G input.md /^ G$/;" s chapter:C end:109 sectionMarker:-
H input.md /^ H$/;" s chapter:C end:112 sectionMarker:-
I input.md /^ I$/;" s chapter:C end:128 sectionMarker:-
C\\# input.md /^# C\\#$/;" c end:146 sectionMarker:#
J input.md /^J$/;" s chapter:C\\# end:133 sectionMarker:-
K input.md /^K$/;" s chapter:C\\# end:136 sectionMarker:-
L input.md /^L$/;" s chapter:C\\# end:146 sectionMarker:-
x input.md /^function x$/;" f
y input.md /^function y$/;" f
z input.md /^z()$/;" f
Expand Down
41 changes: 41 additions & 0 deletions Units/parser-markdown.r/simple-markdown.d/input.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,44 @@ E

F
---

G
-

H
-

I
-

indented
-

indented_with_tab
-

indented_with_space_and_tab
-

text
- ignored
-

# C\#

J
-

K
-

L
-

ignored
-

```foo```

> quoted
---
1 change: 1 addition & 0 deletions Units/parser-markdown.r/xml-comment.d/args.ctags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--sort=no
1 change: 1 addition & 0 deletions Units/parser-markdown.r/xml-comment.d/expected.tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
EXTRACT ME 1 input.md /^# EXTRACT ME 1$/;" c
7 changes: 7 additions & 0 deletions Units/parser-markdown.r/xml-comment.d/input.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!--
# SKIP ME 1
-->

<!-- # SKIP ME 2 -->

# EXTRACT ME 1
2 changes: 1 addition & 1 deletion docs/news.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ The following parsers have been added:
* GNU linker script(LdScript)
* LEX *optlib*
* Man page *optlib*
* Markdown *optlib*
* Markdown
* Maven2 *libxml*
* MesonBuild (Meson) *optlib*
* MesonOptions *optlib+script*
Expand Down
10 changes: 5 additions & 5 deletions main/nestlevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

extern NestingLevels *nestingLevelsNewFull(size_t userDataSize,
void (* deleteUserData)(NestingLevel *))
void (* deleteUserData)(NestingLevel *, void *))
{
NestingLevels *nls = xCalloc (1, NestingLevels);
nls->userDataSize = userDataSize;
Expand All @@ -42,7 +42,7 @@ extern NestingLevels *nestingLevelsNew(size_t userDataSize)
return nestingLevelsNewFull (userDataSize, NULL);
}

extern void nestingLevelsFree(NestingLevels *nls)
extern void nestingLevelsFreeFull(NestingLevels *nls, void *ctxData)
{
int i;
NestingLevel *nl;
Expand All @@ -51,7 +51,7 @@ extern void nestingLevelsFree(NestingLevels *nls)
{
nl = NL_NTH(nls, i);
if (nls->deleteUserData)
nls->deleteUserData (nl);
nls->deleteUserData (nl, ctxData);
nl->corkIndex = CORK_NIL;
}
if (nls->levels) eFree(nls->levels);
Expand Down Expand Up @@ -89,13 +89,13 @@ extern NestingLevel *nestingLevelsTruncate(NestingLevels *nls, int depth, int co
}


extern void nestingLevelsPop(NestingLevels *nls)
extern void nestingLevelsPopFull(NestingLevels *nls, void *ctxData)
{
NestingLevel *nl = nestingLevelsGetCurrent(nls);

Assert (nl != NULL);
if (nls->deleteUserData)
nls->deleteUserData (nl);
nls->deleteUserData (nl, ctxData);
nl->corkIndex = CORK_NIL;
nls->n--;
}
Expand Down
12 changes: 8 additions & 4 deletions main/nestlevel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,23 @@ struct NestingLevels
int n; /* number of levels in use */
int allocated;
size_t userDataSize;
void (* deleteUserData) (NestingLevel *);
/* The second argument is given via nestinglevelsPopFull
* or nestinglevelFreeFull */
void (* deleteUserData) (NestingLevel *, void *);
};

/*
* FUNCTION PROTOTYPES
*/
extern NestingLevels *nestingLevelsNew(size_t userDataSize);
extern NestingLevels *nestingLevelsNewFull(size_t userDataSize,
void (* deleteUserData)(NestingLevel *));
extern void nestingLevelsFree(NestingLevels *nls);
void (* deleteUserData)(NestingLevel *, void *));
#define nestingLevelsFree(NLS) nestingLevelsFreeFull(NLS, NULL)
extern void nestingLevelsFreeFull(NestingLevels *nls, void *ctxData);
extern NestingLevel *nestingLevelsPush(NestingLevels *nls, int corkIndex);
extern NestingLevel * nestingLevelsTruncate(NestingLevels *nls, int depth, int corkIndex);
extern void nestingLevelsPop(NestingLevels *nls);
#define nestingLevelsPop(NLS) nestingLevelsPopFull(NLS, NULL)
extern void nestingLevelsPopFull(NestingLevels *nls, void *ctxData);
#define nestingLevelsGetCurrent(NLS) nestingLevelsGetNthParent((NLS), 0)
extern NestingLevel *nestingLevelsGetNthFromRoot(const NestingLevels *nls, int n);
extern NestingLevel *nestingLevelsGetNthParent(const NestingLevels *nls, int n);
Expand Down
Loading