aboutsummaryrefslogtreecommitdiffstats
path: root/symbol.c
diff options
context:
space:
mode:
Diffstat (limited to 'symbol.c')
-rw-r--r--symbol.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/symbol.c b/symbol.c
index 29052366..99a8b3a5 100644
--- a/symbol.c
+++ b/symbol.c
@@ -292,6 +292,7 @@ make_symbol(const char *name, NODETYPE type)
r->var_value = dupnode(Nnull_string);
r->vname = (char *) name;
r->type = type;
+ r->valref = 1;
return r;
}
@@ -366,7 +367,18 @@ comp_symbol(const void *v1, const void *v2)
n1 = *npp1;
n2 = *npp2;
- return strcmp(n1->vname, n2->vname);
+ // names in awk namespace come out first
+ bool n1_is_in_ns = (strchr(n1->vname, ':') != NULL);
+ bool n2_is_in_ns = (strchr(n2->vname, ':') != NULL);
+
+ if (n1_is_in_ns && n2_is_in_ns)
+ return strcmp(n1->vname, n2->vname);
+ else if (n1_is_in_ns && ! n2_is_in_ns)
+ return 1;
+ else if (! n1_is_in_ns && n2_is_in_ns)
+ return -1;
+ else
+ return strcmp(n1->vname, n2->vname);
}