Don't expand macros that match partial words

Noam Preil · Noam Preil · commit de4bd5078189 · 2020-10-10T05:52:44.000-04:00
diff --git a/assembler/assembler.c b/assembler/assembler.c
@@ -218,6 +218,11 @@ int try_expand_macro(struct assembler_state *state, char **line) {
 				free_flat_list(userparams);
 				continue;
 			}
+			if (match[name_length] && isalpha(match[name_length])) {
+				scas_log(L_DEBUG, "Not whole word, skipping");
+				free_flat_list(userparams);
+				continue;
+			}
 			endmatch = match + name_length;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,11 @@ int try_expand_macro(struct assembler_state state, char *line) {`
`218`	`218`	`free_flat_list(userparams);`
`219`	`219`	`continue;`
`220`	`220`	`}`
	`221`	`+ if (match[name_length] && isalpha(match[name_length])) {`
	`222`	`+ scas_log(L_DEBUG, "Not whole word, skipping");`
	`223`	`+ free_flat_list(userparams);`
	`224`	`+ continue;`
	`225`	`+ }`
`221`	`226`	`endmatch = match + name_length;`
`222`	`227`	`}`
`223`	`228`