|
|
@@ -58,9 +58,8 @@ int interp_init(void) {
|
|
|
|
|
|
int interp_do_keyword(char *p, char c) {
|
|
|
struct klist_node *n;
|
|
|
- int type, out, i, attrs;
|
|
|
+ int type, out, i, attrs, flag = 0;
|
|
|
|
|
|
- char *np;
|
|
|
char *name = NULL, *save;
|
|
|
void *dlib;
|
|
|
|
|
|
@@ -109,7 +108,7 @@ int interp_do_keyword(char *p, char c) {
|
|
|
|
|
|
break;
|
|
|
|
|
|
-
|
|
|
+ /* ABANDONED IN COMPILE MODE */
|
|
|
case '`':
|
|
|
/* pop a number */
|
|
|
|
|
|
@@ -189,13 +188,17 @@ int interp_do_keyword(char *p, char c) {
|
|
|
/* setting 'i = 0', or function call */
|
|
|
getword(p, &type, &out);
|
|
|
|
|
|
- if (type != WORDTYPE_NAME)
|
|
|
- exit(generic_error("unknow keyword", lbsave, lno));
|
|
|
+ if (type == WORDTYPE_KWORD && out == '&') {
|
|
|
+ flag = 1;
|
|
|
+ p++;
|
|
|
|
|
|
- name = np = strndup(p, out);
|
|
|
+ getword(p, &type, &out);
|
|
|
+ }
|
|
|
|
|
|
- if (name[0] == '&')
|
|
|
- name++;
|
|
|
+ if (type != WORDTYPE_NAME)
|
|
|
+ exit(generic_error("unknown keyword", lbsave, lno));
|
|
|
+
|
|
|
+ name = strndup(p, out);
|
|
|
|
|
|
_skip_word(p);
|
|
|
_skip_spaces(p);
|
|
|
@@ -214,7 +217,7 @@ int interp_do_keyword(char *p, char c) {
|
|
|
/* read only */
|
|
|
exit(generic_error("variable sets attribute 'read-only'", lbsave, lno));
|
|
|
|
|
|
- if (n->xmask & 1 && np == name)
|
|
|
+ if (n->xmask & 1 && !flag)
|
|
|
exit(generic_error("no '&' found before global variable", lbsave, lno));
|
|
|
|
|
|
if (!getword(p, &type, &out))
|
|
|
@@ -231,7 +234,7 @@ int interp_do_keyword(char *p, char c) {
|
|
|
|
|
|
n->value = out;
|
|
|
|
|
|
- free(np);
|
|
|
+ free(name);
|
|
|
|
|
|
break;
|
|
|
}
|