|
@@ -85,6 +85,13 @@ __arch_templ int arch_do_keyword(char *p, struct arch *arch_fn) {
|
|
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
|
|
+ case '+':
|
|
|
|
|
+ case '-':
|
|
|
|
|
+ if (!math_set_name(p, arch_fn))
|
|
|
|
|
+ exit(generic_error("unknow keyword", psave, lno));
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
default:
|
|
default:
|
|
|
if (unlikely(!set_name(p, arch_fn) &&
|
|
if (unlikely(!set_name(p, arch_fn) &&
|
|
|
!math_set_name(p, arch_fn) &&
|
|
!math_set_name(p, arch_fn) &&
|
|
@@ -98,9 +105,21 @@ __arch_templ int arch_do_keyword(char *p, struct arch *arch_fn) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+struct klist_node *find_name(char *name) {
|
|
|
|
|
+ struct klist_node *n;
|
|
|
|
|
+
|
|
|
|
|
+ for (n = names_list.next; n != &names_list; n = n->next)
|
|
|
|
|
+ if (!strcmp(n->payload, name))
|
|
|
|
|
+ return n;
|
|
|
|
|
+
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
__arch_templ static int new_var(char *p, struct arch *arch_fn) {
|
|
__arch_templ static int new_var(char *p, struct arch *arch_fn) {
|
|
|
char *name;
|
|
char *name;
|
|
|
int type, out, attr;
|
|
int type, out, attr;
|
|
|
|
|
+ struct klist_node *t;
|
|
|
|
|
|
|
|
getword(p, &type, &out);
|
|
getword(p, &type, &out);
|
|
|
|
|
|
|
@@ -149,6 +168,12 @@ __arch_templ static int new_var(char *p, struct arch *arch_fn) {
|
|
|
|
|
|
|
|
attr = getattrmask(p, vardef_attrtab);
|
|
attr = getattrmask(p, vardef_attrtab);
|
|
|
|
|
|
|
|
|
|
+ if (unlikely((t = find_name(name)) && !(t->xmask & XMASK_WEAK))) {
|
|
|
|
|
+ error(name);
|
|
|
|
|
+
|
|
|
|
|
+ exit(generic_error("name already defined", psave, lno));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
arch_fn->arch_new_var(name, out, attr);
|
|
arch_fn->arch_new_var(name, out, attr);
|
|
|
|
|
|
|
|
/* the name can't be free */
|
|
/* the name can't be free */
|
|
@@ -239,16 +264,6 @@ static int math_set_name(char *p, struct arch *arch_fn) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-int name_defined(char *name) {
|
|
|
|
|
- struct klist_node *n;
|
|
|
|
|
-
|
|
|
|
|
- for (n = names_list.next; n != &names_list; n = n->next)
|
|
|
|
|
- if (!strcmp(n->payload, name))
|
|
|
|
|
- return 1;
|
|
|
|
|
-
|
|
|
|
|
- return 0;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* 1.
|
|
* 1.
|
|
@@ -271,7 +286,7 @@ static int declare_object(char *p, struct arch *arch_fn) {
|
|
|
int type, out, attr;
|
|
int type, out, attr;
|
|
|
|
|
|
|
|
enum { SHARED, NAMES, FUNCTION } guess;
|
|
enum { SHARED, NAMES, FUNCTION } guess;
|
|
|
- struct klist_node *n;
|
|
|
|
|
|
|
+ struct klist_node *n, *t;
|
|
|
|
|
|
|
|
/* skip '<' */
|
|
/* skip '<' */
|
|
|
|
|
|
|
@@ -423,12 +438,22 @@ skip: attr = getattrmask(p, declare_attrtab);
|
|
|
exit(generic_error("one of 'fn' or 'var' must be gave", psave, lno));
|
|
exit(generic_error("one of 'fn' or 'var' must be gave", psave, lno));
|
|
|
|
|
|
|
|
|
|
|
|
|
- if (unlikely(name_defined(n->payload))) {
|
|
|
|
|
|
|
+ if (unlikely((t = find_name(n->payload))) && !(t->xmask & XMASK_WEAK)) {
|
|
|
error((char *) n->payload);
|
|
error((char *) n->payload);
|
|
|
|
|
|
|
|
exit(generic_error("name already defined", psave, lno));
|
|
exit(generic_error("name already defined", psave, lno));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (t && t->xmask == XMASK_WEAK)
|
|
|
|
|
+ if (((t->value & DECLARE_FN) && !(n->value & DECLARE_FN)) ||
|
|
|
|
|
+ ((n->value & DECLARE_FN) && !(t->value & DECLARE_FN))) {
|
|
|
|
|
+ error((char *) n->payload);
|
|
|
|
|
+
|
|
|
|
|
+ exit(generic_error("name defined in different type", psave, lno));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ n->xmask = XMASK_WEAK;
|
|
|
klist_add(&names_list, n);
|
|
klist_add(&names_list, n);
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|