Make it possible to undefine

Noam Preil · pixelherodev · commit fd68d742364b · 2020-09-11T05:11:45.000-04:00
diff --git a/assembler/assembler.c b/assembler/assembler.c
@@ -172,6 +172,9 @@ int try_expand_macro(struct assembler_state *state, char **line) {
 	if (strstr(*line, "macro") == *line + 1) { // Cannot expand macros while defining them
 		return 0;
 	}
+	if (strstr(*line, "undefine") == *line + 1) { // Should not expand while removing
+		return 0;
+	}
 	if (strstr(*line, "ifdef") == *line + 1) { // Should not expand when testing for existence
 		return 0;
 	}
diff --git a/assembler/directives.c b/assembler/directives.c
@@ -433,6 +433,8 @@ int handle_undef(struct assembler_state *state, char **argv, int argc) {
 		return 1;
 	}
 
+	scas_log(L_DEBUG, "Looking for %s", argv[0]);
+
 	int i;
 	for (i = 0; i < state->macros->length; i++) {
 		macro_t *m = state->macros->items[i];

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,9 @@ int try_expand_macro(struct assembler_state state, char *line) {`
`172`	`172`	`if (strstr(line, "macro") == line + 1) { // Cannot expand macros while defining them`
`173`	`173`	`return 0;`
`174`	`174`	`}`
	`175`	`+ if (strstr(line, "undefine") == line + 1) { // Should not expand while removing`
	`176`	`+ return 0;`
	`177`	`+ }`
`175`	`178`	`if (strstr(line, "ifdef") == line + 1) { // Should not expand when testing for existence`
`176`	`179`	`return 0;`
`177`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -433,6 +433,8 @@ int handle_undef(struct assembler_state state, char *argv, int argc) {`
`433`	`433`	`return 1;`
`434`	`434`	`}`
`435`	`435`
	`436`	`+ scas_log(L_DEBUG, "Looking for %s", argv[0]);`
	`437`	`+`
`436`	`438`	`int i;`
`437`	`439`	`for (i = 0; i < state->macros->length; i++) {`
`438`	`440`	`macro_t *m = state->macros->items[i];`