aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

preproc: move %use package parsing to a separate routine

Browse Source 
Move the parsing of %use package names to a separate routine, and stop
using get_id() for that purpose -- get_id() is wrong in a number of
ways.

This also means we can drop the error string argument to get_id().

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2019-09-12 19:27:42 -07:00
parent 02d68d3da0
commit a039fcdb46
1 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
asm/preproc.c
View File

@ -2739,7 +2739,7 @@ static bool is_macro_id(const Token *t)
(t->type == TOK_PREPROC_ID && t->text[1] == '$')); (t->type == TOK_PREPROC_ID && t->text[1] == '$'));
} }
static char *get_id(Token **tp, const char *dname, const char *err) static char *get_id(Token **tp, const char *dname)
{ {
char *id; char *id;
Token *t = *tp; Token *t = *tp;
@ -2749,8 +2749,7 @@ static char *get_id(Token **tp, const char *dname, const char *err)
t = expand_id(t); t = expand_id(t);
if (!is_macro_id(t)) { if (!is_macro_id(t)) {
nasm_nonfatal("`%s' expects a %s", dname, nasm_nonfatal("`%s' expects a macro identifier", dname);
err ? err : "macro identifier");
return NULL; return NULL;
} }
@ -2760,6 +2759,43 @@ static char *get_id(Token **tp, const char *dname, const char *err)
return id; return id;
} }
/* Parse a %use package name and find the package. Set *err on syntax error. */
static const struct use_package *
get_use_pkg(Token *t, const char *dname, bool *err)
{
char *id;
*err = false;
t = t->next; /* Skip directive */
skip_white_(t);
t = expand_smacro(t);
id = NULL;
if (t) {
if (t->type == TOK_ID) {
id = t->text;
} else if (t->type == TOK_STRING) {
nasm_unquote_cstr(t->text, NULL);
id = t->text;
}
}
if (!id) {
nasm_nonfatal("`%s' expects a package name", dname);
*err = true;
return NULL;
}
t = t->next;
skip_white_(t);
if (t)
nasm_warn(WARN_OTHER, "trailing garbage after `%s' ignored", dname);
return nasm_find_use_package(id);
}
/** /**
* find and process preprocessor directive in passed line * find and process preprocessor directive in passed line
* Find out if a line contains a preprocessor directive, and deal * Find out if a line contains a preprocessor directive, and deal
@ -3150,14 +3186,12 @@ static int do_directive(Token *tline, Token **output)
case PP_USE: case PP_USE:
{ {
const struct use_package *pkg; const struct use_package *pkg;
bool err;
if (!(mname = get_id(&tline, dname, "package name"))) pkg = get_use_pkg(tline, dname, &err);
if (err)
goto done; goto done;
if (tline->next)
nasm_warn(WARN_OTHER, "trailing garbage after `%s' ignored", dname);
if (tline->type == TOK_STRING)
nasm_unquote_cstr(tline->text, NULL);
pkg = nasm_find_use_package(tline->text);
if (!pkg) { if (!pkg) {
nasm_nonfatal("unknown `%s' package: %s", dname, tline->text); nasm_nonfatal("unknown `%s' package: %s", dname, tline->text);
} else if (!use_loaded[pkg->index]) { } else if (!use_loaded[pkg->index]) {
@ -3608,7 +3642,7 @@ issue_error:
SMacro tmpl; SMacro tmpl;
Token **lastp; Token **lastp;
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
nasm_zero(tmpl); nasm_zero(tmpl);
@ -3673,7 +3707,7 @@ issue_error:
case PP_UNDEF: case PP_UNDEF:
case PP_UNDEFALIAS: case PP_UNDEFALIAS:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
if (tline->next) if (tline->next)
nasm_warn(WARN_OTHER, "trailing garbage after macro name ignored"); nasm_warn(WARN_OTHER, "trailing garbage after macro name ignored");
@ -3682,7 +3716,7 @@ issue_error:
break; break;
case PP_DEFSTR: case PP_DEFSTR:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3705,7 +3739,7 @@ issue_error:
break; break;
case PP_DEFTOK: case PP_DEFTOK:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3743,7 +3777,7 @@ issue_error:
{ {
const char *found_path; const char *found_path;
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3782,7 +3816,7 @@ issue_error:
} }
case PP_STRLEN: case PP_STRLEN:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3813,7 +3847,7 @@ issue_error:
return DIRECTIVE_FOUND; return DIRECTIVE_FOUND;
case PP_STRCAT: case PP_STRCAT:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3863,7 +3897,7 @@ issue_error:
int64_t start, count; int64_t start, count;
size_t len; size_t len;
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;
@ -3942,7 +3976,7 @@ issue_error:
} }
case PP_ASSIGN: case PP_ASSIGN:
if (!(mname = get_id(&tline, dname, NULL))) if (!(mname = get_id(&tline, dname)))
goto done; goto done;
last = tline; last = tline;