Fortran: introduce extended version of newTokenFrom()

techee · masatake · commit 027d6b2ad480 · 2021-12-28T07:49:21.000+09:00
Change suggested by @masatake. @mastake edited the commit log.
diff --git a/parsers/fortran.c b/parsers/fortran.c
@@ -468,17 +468,22 @@ static tokenInfo *newToken (void)
 	return token;
 }
 
-static tokenInfo *newTokenFrom (tokenInfo *const token)
+static tokenInfo *newTokenFromFull (tokenInfo *const token, bool copyStr)
 {
 	tokenInfo *result = xMalloc (1, tokenInfo);
 	*result = *token;
-	result->string = vStringNewCopy (token->string);
+	result->string = copyStr? vStringNewCopy (token->string): vStringNew();
 	token->secondary = NULL;
 	token->parentType = NULL;
 	token->signature = NULL;
 	return result;
 }
 
+static tokenInfo *newTokenFrom (tokenInfo *const token)
+{
+	return newTokenFromFull (token, true);
+}
+
 static void deleteToken (tokenInfo *const token)
 {
 	if (token != NULL)

Original file line number	Diff line number	Diff line change
`@@ -468,17 +468,22 @@ static tokenInfo *newToken (void)`
`468`	`468`	`return token;`
`469`	`469`	`}`
`470`	`470`
`471`		`-static tokenInfo newTokenFrom (tokenInfo const token)`
	`471`	`+static tokenInfo newTokenFromFull (tokenInfo const token, bool copyStr)`
`472`	`472`	`{`
`473`	`473`	`tokenInfo *result = xMalloc (1, tokenInfo);`
`474`	`474`	`result = token;`
`475`		`- result->string = vStringNewCopy (token->string);`
	`475`	`+ result->string = copyStr? vStringNewCopy (token->string): vStringNew();`
`476`	`476`	`token->secondary = NULL;`
`477`	`477`	`token->parentType = NULL;`
`478`	`478`	`token->signature = NULL;`
`479`	`479`	`return result;`
`480`	`480`	`}`
`481`	`481`
	`482`	`+static tokenInfo newTokenFrom (tokenInfo const token)`
	`483`	`+{`
	`484`	`+ return newTokenFromFull (token, true);`
	`485`	`+}`
	`486`	`+`
`482`	`487`	`static void deleteToken (tokenInfo *const token)`
`483`	`488`	`{`
`484`	`489`	`if (token != NULL)`