summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
committerH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
commit7ad25b2e1828a4569812f3296473f7a3bc7cd941 (patch)
tree2588114d21407401b7e57092469edec92ed91f20 /asm
parent90b1ccff86d530b140eb391ede3c50e33bcf9410 (diff)
downloadnasm-7ad25b2e1828a4569812f3296473f7a3bc7cd941.tar.gz
Change LBL_NONE to LBL_none
NASM convention is to use all-upper-case for "real" information, and mixed-case (upper case common prefix, lower case description) for meta-information. This is a highly useful distinction. Thus "LBL_NONE" implies an actual label of type "NONE", as opposed to no label at all. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'asm')
-rw-r--r--asm/eval.c2
-rw-r--r--asm/labels.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/asm/eval.c b/asm/eval.c
index db915ef2..c99ee11c 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -974,7 +974,7 @@ static expr *expr6(void)
} else {
enum label_type ltype;
ltype = lookup_label(tokval->t_charptr, &label_seg, &label_ofs);
- if (ltype == LBL_NONE) {
+ if (ltype == LBL_none) {
scope = local_scope(tokval->t_charptr);
if (critical) {
nasm_nonfatal("symbol `%s%s' not defined%s",
diff --git a/asm/labels.c b/asm/labels.c
index 4618fc70..f6b940fc 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -272,7 +272,7 @@ enum label_type lookup_label(const char *label,
union label *lptr;
if (!initialized)
- return LBL_NONE;
+ return LBL_none;
lptr = find_label(label, false, NULL);
if (lptr && lptr->defn.defined) {
@@ -284,7 +284,7 @@ enum label_type lookup_label(const char *label,
return lptr->defn.type;
}
- return LBL_NONE;
+ return LBL_none;
}
static inline bool is_global(enum label_type type)