Tex: parse \def\cmd{replacement}

Author: techee

Units/parser-tex.r/newcommand.d/expected.tags

@@ -1,4 +1,5 @@
 \\bar	input.tex	/^\\providecommand{\\bar}{\\section{#1}}$/;"	C
+\\baz	input.tex	/^\\def\\baz{\\section{#1}}$/;"	C
 \\foo	input.tex	/^\\renewcommand{\\foo}{\\section{#1}}$/;"	C
 \\mysection0	input.tex	/^\\newcommand{\\mysection0}{\\section{#1}}$/;"	C
 \\mysection1	input.tex	/^\\newcommand{\\mysection1}[1]{\\section{#1}}$/;"	C

Units/parser-tex.r/newcommand.d/input.tex

@@ -4,6 +4,7 @@
 \newcommand{\mysection2}[1][1]{\section{#1}}
 \renewcommand{\foo}{\section{#1}}
 \providecommand{\bar}{\section{#1}}
+\def\baz{\section{#1}}
 \begin{document}
 \mysection0{ABC}
 \mysection1{EFG}

parsers/tex.c

@@ -65,6 +65,7 @@ enum eKeywordId {
 	KEYWORD_newcommand,
 	KEYWORD_renewcommand,
 	KEYWORD_providecommand,
+	KEYWORD_def,
 	KEYWORD_newcounter,
 };
 typedef int keywordId; /* to allow KEYWORD_NONE */
@@ -173,6 +174,7 @@ static const keywordTable TexKeywordTable [] = {
 	{ "newcommand",		KEYWORD_newcommand			},
 	{ "renewcommand",	KEYWORD_renewcommand		},
 	{ "providecommand",	KEYWORD_providecommand		},
+	{ "def",			KEYWORD_def					},
 	{ "newcounter",		KEYWORD_newcounter			},
 };
 
@@ -606,13 +608,13 @@ static bool parseWithStrategy (tokenInfo *token,
 		}
 		else if (s->type == '*' && isType (token, '*'))
 			next_token = true;
-		else if (s->type == '{' && isType (token, '{'))
+		else if ((s->type == '{' && isType (token, '{')) || (s->type == '\\' && isType (token, TOKEN_IDENTIFIER)))
 		{
 			int depth = 1;
 
 			next_token = true;
 
-			if (!readToken (token))
+			if (s->type == '{' && !readToken (token))
 			{
 				eof = true;
 				break;
@@ -622,6 +624,11 @@ static bool parseWithStrategy (tokenInfo *token,
 				copyToken (name, token);
 				vStringClear (name->string);
 			}
+			if (s->type == '\\')
+			{
+				vStringCat (name->string, token->string);
+				depth = 0;
+			}
 
 			/* Handle the case the code like \section{} */
 			if (isType (token, '}'))
@@ -845,6 +852,37 @@ static bool parseNewcommand (tokenInfo *const token, bool *tokenUnprocessed)
 	return eof;
 }
 
+static bool parseDef (tokenInfo *const token, bool *tokenUnprocessed)
+{
+	bool eof = false;
+
+	/* \def\cmd{replacement} */
+	struct TexParseStrategy strategy [] = {
+		{
+			.type = '\\',
+			.flags = 0,
+			.kindIndex = TEXTAG_COMMAND,
+			.roleIndex = ROLE_DEFINITION_INDEX,
+			.name = NULL,
+			.unique = false,
+		},
+		{
+			.type = '{',
+			.flags = 0,
+			.kindIndex = KIND_GHOST_INDEX,
+			.name = NULL,
+		},
+		{
+			.type = 0
+		}
+	};
+
+	if (parseWithStrategy (token, strategy, tokenUnprocessed))
+		eof = true;
+
+	return eof;
+}
+
 static bool parseNewcounter (tokenInfo *const token, bool *tokenUnprocessed)
 {
 	bool eof = false;
@@ -942,6 +980,9 @@ static void parseTexFile (tokenInfo *const token)
 				case KEYWORD_providecommand:
 					eof = parseNewcommand (token, &tokenUnprocessed);
 					break;
+				case KEYWORD_def:
+					eof = parseDef (token, &tokenUnprocessed);
+					break;
 				case KEYWORD_newcounter:
 					eof = parseNewcounter (token, &tokenUnprocessed);
 					break;