|
@@ -61,7 +61,7 @@ int interp_do_keyword(char *p, char c) {
|
|
|
int type, out, i, attrs;
|
|
int type, out, i, attrs;
|
|
|
|
|
|
|
|
char *np;
|
|
char *np;
|
|
|
- char *name = NULL;
|
|
|
|
|
|
|
+ char *name = NULL, *save;
|
|
|
void *dlib;
|
|
void *dlib;
|
|
|
|
|
|
|
|
lbsave = p;
|
|
lbsave = p;
|
|
@@ -94,8 +94,12 @@ int interp_do_keyword(char *p, char c) {
|
|
|
getword(p, &type, &out);
|
|
getword(p, &type, &out);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (type != WORDTYPE_NR)
|
|
|
|
|
- exit(generic_error("'$' requires a number", lbsave, lno));
|
|
|
|
|
|
|
+ if (type != WORDTYPE_NR) {
|
|
|
|
|
+ if (type)
|
|
|
|
|
+ exit(generic_error("'$' requires a number", lbsave, lno));
|
|
|
|
|
+
|
|
|
|
|
+ out = 0;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
p++;
|
|
p++;
|
|
|
_skip_word(p);
|
|
_skip_word(p);
|
|
@@ -171,13 +175,18 @@ int interp_do_keyword(char *p, char c) {
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case '@':
|
|
case '@':
|
|
|
|
|
+ ++p;
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+
|
|
|
/* function call. the real funny thing is going on :-) */
|
|
/* function call. the real funny thing is going on :-) */
|
|
|
do_funcall(p);
|
|
do_funcall(p);
|
|
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
default:
|
|
|
- /* setting 'i = 0' */
|
|
|
|
|
|
|
+ save = p;
|
|
|
|
|
+
|
|
|
|
|
+ /* setting 'i = 0', or function call */
|
|
|
getword(p, &type, &out);
|
|
getword(p, &type, &out);
|
|
|
|
|
|
|
|
if (type != WORDTYPE_NAME)
|
|
if (type != WORDTYPE_NAME)
|
|
@@ -188,6 +197,16 @@ int interp_do_keyword(char *p, char c) {
|
|
|
if (name[0] == '&')
|
|
if (name[0] == '&')
|
|
|
name++;
|
|
name++;
|
|
|
|
|
|
|
|
|
|
+ _skip_word(p);
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+
|
|
|
|
|
+ if (*p == '(') {
|
|
|
|
|
+ /* function calling */
|
|
|
|
|
+ do_funcall(save);
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (!(n = find_name(name)))
|
|
if (!(n = find_name(name)))
|
|
|
exit(generic_error("name not found", lbsave, lno));
|
|
exit(generic_error("name not found", lbsave, lno));
|
|
|
|
|
|
|
@@ -198,9 +217,6 @@ int interp_do_keyword(char *p, char c) {
|
|
|
if (n->xmask & 1 && np == name)
|
|
if (n->xmask & 1 && np == name)
|
|
|
exit(generic_error("no '&' found before global variable", lbsave, lno));
|
|
exit(generic_error("no '&' found before global variable", lbsave, lno));
|
|
|
|
|
|
|
|
- _skip_word(p);
|
|
|
|
|
- _skip_spaces(p);
|
|
|
|
|
-
|
|
|
|
|
if (!getword(p, &type, &out))
|
|
if (!getword(p, &type, &out))
|
|
|
exit(generic_error("no equal", lbsave, lno));
|
|
exit(generic_error("no equal", lbsave, lno));
|
|
|
|
|
|
|
@@ -233,9 +249,6 @@ static int do_funcall(char *p) {
|
|
|
|
|
|
|
|
/* get function name */
|
|
/* get function name */
|
|
|
|
|
|
|
|
- p++;
|
|
|
|
|
- _skip_spaces(p);
|
|
|
|
|
-
|
|
|
|
|
p = getword(p, &type, &out);
|
|
p = getword(p, &type, &out);
|
|
|
|
|
|
|
|
if (type != WORDTYPE_NAME)
|
|
if (type != WORDTYPE_NAME)
|
|
@@ -257,6 +270,7 @@ static int do_funcall(char *p) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ error(name);
|
|
|
exit(generic_error("function not found", lbsave, lno));
|
|
exit(generic_error("function not found", lbsave, lno));
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -299,7 +313,9 @@ static int do_dl_funcall(void *f, char *p) {
|
|
|
name = strndup(p, out);
|
|
name = strndup(p, out);
|
|
|
|
|
|
|
|
if (!(node = find_name(name))) {
|
|
if (!(node = find_name(name))) {
|
|
|
|
|
+ error(name);
|
|
|
generic_error("name not found", lbsave, lno);
|
|
generic_error("name not found", lbsave, lno);
|
|
|
|
|
+
|
|
|
free(name);
|
|
free(name);
|
|
|
|
|
|
|
|
exit(1);
|
|
exit(1);
|
|
@@ -321,7 +337,7 @@ static int do_dl_funcall(void *f, char *p) {
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
case WORDTYPE_STR:
|
|
case WORDTYPE_STR:
|
|
|
- name = strndup(p + 2, out - 1);
|
|
|
|
|
|
|
+ name = strndup(p + 1, out);
|
|
|
dest = malloc(out - 1);
|
|
dest = malloc(out - 1);
|
|
|
|
|
|
|
|
next_arg->arg_s = dest;
|
|
next_arg->arg_s = dest;
|
|
@@ -343,7 +359,7 @@ static int do_dl_funcall(void *f, char *p) {
|
|
|
|
|
|
|
|
if (out == ')') {
|
|
if (out == ')') {
|
|
|
p++;
|
|
p++;
|
|
|
- _skip_spaces(p);;
|
|
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
|
|
|
/* ; */
|
|
/* ; */
|
|
|
|
|
|