Fix parameter-less macros

Noam Preil · Noam Preil · commit 719a2100263b · 2020-07-01T17:27:12.000-04:00
diff --git a/assembler/directives.c b/assembler/directives.c
@@ -1147,12 +1147,12 @@ int handle_macro(struct assembler_state *state, char **argv, int argc) {
 	}
 	char *location = strchr(argv[0], '(');
         
-	if (location == NULL || location == argv[0]) {
+	if (location == argv[0]) {
 		ERROR(ERROR_INVALID_DIRECTIVE, state->column, "macro without a name");
 		return 1;
 	}
 
-	if (strchr(location + 1, '(') != NULL) {
+	if (location && strchr(location + 1, '(') != NULL) {
 		ERROR(ERROR_INVALID_DIRECTIVE, state->column, "macro contains excess parentheses");
 		return 1;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1147,12 +1147,12 @@ int handle_macro(struct assembler_state state, char *argv, int argc) {`
`1147`	`1147`	`}`
`1148`	`1148`	`char *location = strchr(argv[0], '(');`
`1149`	`1149`
`1150`		`- if (location == NULL \|\| location == argv[0]) {`
	`1150`	`+ if (location == argv[0]) {`
`1151`	`1151`	`ERROR(ERROR_INVALID_DIRECTIVE, state->column, "macro without a name");`
`1152`	`1152`	`return 1;`
`1153`	`1153`	`}`
`1154`	`1154`
`1155`		`- if (strchr(location + 1, '(') != NULL) {`
	`1155`	`+ if (location && strchr(location + 1, '(') != NULL) {`
`1156`	`1156`	`ERROR(ERROR_INVALID_DIRECTIVE, state->column, "macro contains excess parentheses");`
`1157`	`1157`	`return 1;`
`1158`	`1158`	`}`