Merge pull request #3713 from masatake/misc-fix

masatake · web-flow · commit 6b06565cd3b9 · 2023-05-05T10:53:00.000+09:00
Misc fix
diff --git a/.gitignore b/.gitignore
@@ -85,6 +85,9 @@ _build
 man/ctags.1
 man/ctags.1.html
 man/ctags.1.rst
+man/ctags-*.5
+man/ctags-*.5.rst
+man/ctags-*.5.html
 man/ctags-*.7
 man/ctags-*.7.rst
 man/ctags-*.7.html
@@ -93,6 +96,7 @@ man/readtags.1
 man/readtags.1.rst
 man/readtags.1.html
 man/tags.5
+man/tags.5.rst
 man/tags.5.html
 man/*.[157].in
 ManTest
diff --git a/Tmain/common-prelude.d/chop.expected b/Tmain/common-prelude.d/chop.expected
@@ -0,0 +1,6 @@
+(abcx)
+(abc)
+(abc )
+(abc)
+(abcx)
+(abcx)
diff --git a/Tmain/common-prelude.d/chop.ps b/Tmain/common-prelude.d/chop.ps
diff --git a/Tmain/common-prelude.d/stdout-expected.txt b/Tmain/common-prelude.d/stdout-expected.txt
@@ -1,6 +1,7 @@
 aindex.ps...0
 amember.ps...0
 buildstring.ps...0
+chop.ps...0
 dedup.ps...0
 dedup_spaces.ps...0
 ndup.ps...0
diff --git a/Tmain/optscript.d/stack.expected b/Tmain/optscript.d/stack.expected
@@ -34,3 +34,4 @@
 3
 3
 /A
+/rangecheck
diff --git a/Tmain/optscript.d/stack.ps b/Tmain/optscript.d/stack.ps
diff --git a/docs/man/ctags-lang-asm.7.rst b/docs/man/ctags-lang-asm.7.rst
@@ -60,7 +60,7 @@ The main effects of running the CPreProcessor parser;
 
 * lines started from `//` are stripped as comments,
 * areas surrounded by the pair of `/*` and `*/` are
-  started as comments, and
+  stripped as comments, and
 * macros defined with `#define` are extracted as tags.
 
 Set ``runCPreProcessor`` to ``false`` for disabling the CPreProcessor
diff --git a/dsl/optscript.c b/dsl/optscript.c
@@ -2772,6 +2772,8 @@ op_roll (OptVM *vm, EsObject *name)
 	if (!es_integer_p (nobj))
 		return OPT_ERR_TYPECHECK;
 	int n = es_integer_get (nobj);
+	if (n < 0)
+		return OPT_ERR_RANGECHECK;
 
 	if ((((int)c) - 2) < n)
 		return OPT_ERR_UNDERFLOW;
diff --git a/main/CommonPrelude.c b/main/CommonPrelude.c
@@ -119,6 +119,27 @@ const char ctagsCommonPrelude []=
 "    exch copy pop\n"
 "} __bddef\n"
 "\n"
+"(string _CHOP string)\n"
+"/_chop {\n"
+"    mark exch {} forall pop _buildstring\n"
+"} __bddef\n"
+"\n"
+"(string _CHOP_SPACE string)\n"
+"/_chop_space {\n"
+"    dup length dup 0 gt {\n"
+"        % string length\n"
+"        1 sub\n"
+"        % string `length - 1`\n"
+"        1 index exch\n"
+"        % string string `length - 1`\n"
+"        get (\\n\\t\\r\\f\\v ) exch _amember {\n"
+"            _chop\n"
+"        } if\n"
+"    } {\n"
+"        pop                     % pop the length\n"
+"    } ifelse\n"
+"} __bddef\n"
+"\n"
 "% /x mark 40 (a) 32 32 10 (b) 10 10 9 9 (xyz) 9 9 41 _buildstring def\n"
 "% x _normalize_spaces! x pstack\n"
 "\n"
diff --git a/main/CommonPrelude.ps b/main/CommonPrelude.ps
diff --git a/main/options.c b/main/options.c
@@ -2564,9 +2564,8 @@ static void processHeaderListOption (const int option, const char *parameter)
 /*
  *  Token ignore processing
  */
-static void readIgnoreList (const char *const list)
+static void readIgnoreList (langType lang, const char *const list)
 {
-	langType lang = getNamedLanguage ("CPreProcessor", 0);
 	char* newList = stringCopy (list);
 	const char *token = strtok (newList, IGNORE_SEPARATORS);
 
@@ -2578,10 +2577,8 @@ static void readIgnoreList (const char *const list)
 	eFree (newList);
 }
 
-static void addIgnoreListFromFile (const char *const fileName)
+static void addIgnoreListFromFile (langType lang, const char *const fileName)
 {
-	langType lang = getNamedLanguage ("CPreProcessor", 0);
-
 	stringList* tokens = stringListNewFromFile (fileName);
 	if (tokens == NULL)
 		error (FATAL | PERROR, "cannot open \"%s\"", fileName);
@@ -2607,16 +2604,16 @@ static void processIgnoreOption (const char *const list, int IgnoreOrDefine)
 	else if (strchr ("@./\\", list [0]) != NULL)
 	{
 		const char* fileName = (*list == '@') ? list + 1 : list;
-		addIgnoreListFromFile (fileName);
+		addIgnoreListFromFile (lang, fileName);
 	}
 #if defined (WIN32)
 	else if (isalpha (list [0])  &&  list [1] == ':')
-		addIgnoreListFromFile (list);
+		addIgnoreListFromFile (lang, list);
 #endif
 	else if (strcmp (list, "-") == 0)
 		applyLanguageParam (lang, "ignore", NULL);
 	else
-		readIgnoreList (list);
+		readIgnoreList (lang, list);
 }
 
 static void processAnonHashOption (const char *const option CTAGS_ATTR_UNUSED, const char *const parameter CTAGS_ATTR_UNUSED)
diff --git a/man/ctags-lang-asm.7.rst.in b/man/ctags-lang-asm.7.rst.in
@@ -60,7 +60,7 @@ The main effects of running the CPreProcessor parser;
 
 * lines started from `//` are stripped as comments,
 * areas surrounded by the pair of `/*` and `*/` are
-  started as comments, and
+  stripped as comments, and
 * macros defined with `#define` are extracted as tags.
 
 Set ``runCPreProcessor`` to ``false`` for disabling the CPreProcessor
diff --git a/misc/optlib2c b/misc/optlib2c
@@ -282,7 +282,7 @@ my $options =
 	   unless ($_[0]->{'langdef'} eq $1);
 	 return parse_regex ($3, $_[0], 1, $2);
        } ],
-     [ qr/^--_mtable-extend-([^=]*)=(.*)\+(.*)/, sub {
+     [ qr/^--_mtable-extend-([^=]*)=([a-zA-Z_0-9]+)\+([a-zA-Z_0-9]+)/, sub {
 	 die "Don't use --_mline-extend-<LANG>= option before defining the language"
 	   if (! defined $_[0]->{'langdef'});
 	 die "Extending a multitable regex is allowed only to the language specified with --langdef: $1"
diff --git a/parsers/cpreprocessor.c b/parsers/cpreprocessor.c
@@ -871,7 +871,7 @@ static void makeIncludeTag (const  char *const name, bool systemHeader)
 	}
 }
 
-static void makeParamTag (vString *name, short nth, bool placeholder)
+static int makeParamTag (vString *name, short nth, bool placeholder)
 {
 	bool standing_alone = doesCPreProRunAsStandaloneParser(CPREPRO_MACRO);
 
@@ -890,15 +890,17 @@ static void makeParamTag (vString *name, short nth, bool placeholder)
 		if (placeholder)
 			markTagAsPlaceholder (e, placeholder);
 	}
+	return r;
 }
 
-static void regenreateSignatureFromParameters (vString * buffer, int from, int to)
+static void makeSignatureStringFromParameters (vString * buffer, intArray *parameters)
 {
 	vStringPut(buffer, '(');
-	for (int pindex = from; pindex < to; pindex++)
+	for (size_t i = 0; i < intArrayCount (parameters); i++)
 	{
+		int pindex = intArrayItem (parameters, i);
 		tagEntryInfo *e = getEntryInCorkQueue (pindex);
-		if (e && !isTagExtra (e))
+		if (e)
 		{
 			vStringCatS (buffer, e->name);
 			vStringPut (buffer, ',');
@@ -939,6 +941,7 @@ static int directiveDefine (const int c, bool undef)
 
 			if (p == '(')
 			{
+				intArray *params = intArrayNew ();
 				vString *param = vStringNew ();
 				int param_start = (int)countEntryInCorkQueue();
 				do {
@@ -953,7 +956,8 @@ static int directiveDefine (const int c, bool undef)
 
 					if (vStringLength (param) > 0)
 					{
-						makeParamTag (param, nth++, vStringChar(param, 0) == '.');
+						int r = makeParamTag (param, nth++, vStringChar(param, 0) == '.');
+						intArrayAdd (params, r);
 						vStringClear (param);
 					}
 					if (p == '\\')
@@ -965,12 +969,13 @@ static int directiveDefine (const int c, bool undef)
 				if (p == ')')
 				{
 					vString *signature = vStringNew ();
-					regenreateSignatureFromParameters (signature, param_start, param_end);
+					makeSignatureStringFromParameters (signature, params);
 					r = makeDefineTag (vStringValue (Cpp.directive.name), vStringValue (signature), undef);
 					vStringDelete (signature);
 				}
 				else
 					r = makeDefineTag (vStringValue (Cpp.directive.name), NULL, undef);
+				intArrayDelete (params);
 
 				tagEntryInfo *e = getEntryInCorkQueue (r);
 				if (e)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +(abcx)
 +(abc)
 +(abc )
 +(abc)
 +(abcx)
 +(abcx)
Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,4 @@`
`34`	`34`	`3`
`35`	`35`	`3`
`36`	`36`	`/A`
	`37`	`+/rangecheck`