Merge pull request #3236 from techee/markdown3

Markdown: rewrite in C
universal-ctags · Jan 2, 2022 · e7f2c05 · e7f2c05
2 parents c4378f2 + 78320f2
commit e7f2c05
Show file tree

Hide file tree

Showing 19 changed files with 430 additions and 826 deletions.
diff --git a/Units/parser-markdown.r/backquote.d/args.ctags b/Units/parser-markdown.r/backquote.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-markdown.r/backquote.d/expected.tags b/Units/parser-markdown.r/backquote.d/expected.tags
@@ -0,0 +1 @@
+A	input.md	/^# A$/;"	c
diff --git a/Units/parser-markdown.r/backquote.d/input.md b/Units/parser-markdown.r/backquote.d/input.md
@@ -0,0 +1,3 @@
+  `O`
+# A
+
diff --git a/Units/parser-markdown.r/frontmatter.d/input.md b/Units/parser-markdown.r/frontmatter.d/input.md
@@ -6,6 +6,7 @@ tags: ['code','python']
 menu:
     main:
         parent: 'code'
+layout: default
 ---
 
 # About this input

diff --git a/Units/parser-markdown.r/simple-markdown.d/expected.tags b/Units/parser-markdown.r/simple-markdown.d/expected.tags
@@ -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

diff --git a/Units/parser-markdown.r/simple-markdown.d/input.md b/Units/parser-markdown.r/simple-markdown.d/input.md
@@ -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
+---
diff --git a/Units/parser-markdown.r/xml-comment.d/args.ctags b/Units/parser-markdown.r/xml-comment.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-markdown.r/xml-comment.d/expected.tags b/Units/parser-markdown.r/xml-comment.d/expected.tags
@@ -0,0 +1 @@
+EXTRACT ME 1	input.md	/^# EXTRACT ME 1$/;"	c
diff --git a/Units/parser-markdown.r/xml-comment.d/input.md b/Units/parser-markdown.r/xml-comment.d/input.md
@@ -0,0 +1,7 @@
+<!--
+# SKIP ME 1
+-->
+
+<!-- # SKIP ME 2 -->
+
+# EXTRACT ME 1
diff --git a/docs/news.rst b/docs/news.rst
@@ -430,7 +430,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*

diff --git a/main/nestlevel.c b/main/nestlevel.c
@@ -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;
@@ -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;
@@ -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);
@@ -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--;
 }

diff --git a/main/nestlevel.h b/main/nestlevel.h
@@ -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);