|
@@ -246,18 +246,14 @@ static int set_name(char *p, char *name) {
|
|
|
|
|
|
|
|
|
|
|
|
|
int do_funcall(char *p) {
|
|
int do_funcall(char *p) {
|
|
|
-// struct arg_entry *args, *next_arg;
|
|
|
|
|
int out, type;
|
|
int out, type;
|
|
|
- char *funcname;
|
|
|
|
|
|
|
+ char *funcname, *arg;
|
|
|
|
|
|
|
|
getword(p, &type, &out);
|
|
getword(p, &type, &out);
|
|
|
|
|
|
|
|
if (type != WORDTYPE_NAME)
|
|
if (type != WORDTYPE_NAME)
|
|
|
exit(generic_error("a function name required", lbsave, lno));
|
|
exit(generic_error("a function name required", lbsave, lno));
|
|
|
|
|
|
|
|
-// args = malloc(sizeof(struct arg_entry));
|
|
|
|
|
-// next_arg = args;
|
|
|
|
|
-
|
|
|
|
|
funcname = strndup(p, out);
|
|
funcname = strndup(p, out);
|
|
|
p += out;
|
|
p += out;
|
|
|
|
|
|
|
@@ -267,6 +263,54 @@ int do_funcall(char *p) {
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+
|
|
|
|
|
+ /* get all arguments and call them */
|
|
|
|
|
+
|
|
|
|
|
+ while (getword(p, &type, &out)) {
|
|
|
|
|
+ switch (type) {
|
|
|
|
|
+ case WORDTYPE_STR:
|
|
|
|
|
+ arg = strndup(p + 1, out);
|
|
|
|
|
+
|
|
|
|
|
+ printf("string: %s\n", arg);
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
+ case WORDTYPE_NR:
|
|
|
|
|
+ printf("number %d\n", out);
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
+ case WORDTYPE_NAME:
|
|
|
|
|
+ arg = strndup(p, out);
|
|
|
|
|
+
|
|
|
|
|
+ printf("name: %s\n", arg);
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
+ case WORDTYPE_KWORD:
|
|
|
|
|
+ if (out != ',')
|
|
|
|
|
+ exit(generic_error("unknow keyword after arguments", lbsave, lno));
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+
|
|
|
|
|
+ default:
|
|
|
|
|
+ exit(generic_error("error type passing argument", lbsave, lno));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (type == WORDTYPE_STR)
|
|
|
|
|
+ p += out + 2;
|
|
|
|
|
+
|
|
|
|
|
+ else if (type == WORDTYPE_KWORD) {
|
|
|
|
|
+ p++;
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ else
|
|
|
|
|
+ _skip_word(p);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ free(arg);
|
|
|
free(funcname);
|
|
free(funcname);
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|