Переглянути джерело

tripl: sweet: now you can use ',' between arguments

rain 4 роки тому
батько
коміт
ccd0d20753
4 змінених файлів з 65 додано та 13 видалено
  1. 13 3
      arch/interp/interp.c
  2. 49 5
      arch/x86_64/asm.c
  3. 2 4
      sample.trp
  4. 1 1
      tripl.c

+ 13 - 3
arch/interp/interp.c

@@ -323,18 +323,28 @@ static int do_dl_funcall(void *f, char *p) {
 
 			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));
 
 			break;
 		}
 
-		if (type != WORDTYPE_STR) {
-			_skip_word(p);
+		if (type == WORDTYPE_STR) 
+			p += out + 2;
+
+		else if (type == WORDTYPE_KWORD) {
+			p++;
+			_skip_spaces(p);
 		}
 
 		else 
-			p += out + 2;
+			_skip_word(p);
 
 		++n;
 	}

+ 49 - 5
arch/x86_64/asm.c

@@ -246,18 +246,14 @@ static int set_name(char *p, char *name) {
 
 
 int do_funcall(char *p) {
-//	struct arg_entry *args, *next_arg;
 	int out, type;
-	char *funcname;
+	char *funcname, *arg;
 
 	getword(p, &type, &out);
 
 	if (type != WORDTYPE_NAME) 
 		exit(generic_error("a function name required", lbsave, lno));
 
-//	args = malloc(sizeof(struct arg_entry));
-//	next_arg = args;
-
 	funcname = strndup(p, out);
 	p += out;
 
@@ -267,6 +263,54 @@ int do_funcall(char *p) {
 		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);
 
 	return 0;

+ 2 - 4
sample.trp

@@ -1,8 +1,6 @@
 $ age 12;
-!;
 
-< "libc-2.33.so";
-@ printf "hello, world\n";
-@ printf "my age: %d\n" age;
+@ printf "hello, world\n", no;
+@ printf "my age: %d\n", age;
 
 

+ 1 - 1
tripl.c

@@ -203,7 +203,7 @@ char *getword(char *fbuffer, int *type, int *out) {
 			if (in) {
 				/* end */
 
-				*out = i;
+				*out = i - 1;
 				return fbuffer;
 			}