浏览代码

tripl: 1.0.0-pre: beta test for interpreter

rain 4 年之前
父节点
当前提交
ed36d04b93
共有 5 个文件被更改,包括 111 次插入 和 29 次删除
  1. 2 1
      Makefile
  2. 13 10
      arch/interp/interp.c
  3. 1 1
      arch/x86_64/asm.c
  4. 58 0
      scripts/mkbeta.sh
  5. 37 17
      tripl.c

+ 2 - 1
Makefile

@@ -16,7 +16,6 @@ all : $(tripl-objs)
 install : $(tripl-out)
 	@install $(tripl-out) $(install-dir)
 
-
 %.o : %.c
 	@$(CC) 	-c $*.c $(CFLAGS)
 	@echo -e "\tCC\t\t\t$*.c"
@@ -26,4 +25,6 @@ install : $(tripl-out)
 	@$(RM) 	-f $(tripl-objs) $(tripl-out)
 	@$(MAKE) -C arch/ clean
 
+startbeta:
+	touch "betatest-`date +\"%Y:%m:%d\"`"
 

+ 13 - 10
arch/interp/interp.c

@@ -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;
 	}

+ 1 - 1
arch/x86_64/asm.c

@@ -184,7 +184,7 @@ int x86_64_do_asm(char *p, char c) {
 		getword(p, &type, &out);
 
 		if (type != WORDTYPE_NAME) 
-			exit(generic_error("unknow keyword", lbsave, lno));
+			exit(generic_error("unknown keyword", lbsave, lno));
 
 		name = strndup(p, out);
 

+ 58 - 0
scripts/mkbeta.sh

@@ -0,0 +1,58 @@
+#! /usr/bin/bash
+
+# mkbeta.sh: start a new beta test. 
+
+beta="betatest-`date +\"%Y.%m.%d\"`"
+echo "starting beta test: $beta"
+
+echo -n "# " > $beta 
+date >> $beta
+
+vim .test.trp
+
+echo -en "\033[1;36;40m"
+echo "Running: "
+echo -en "\033[0m"
+
+cat .test.trp >> $beta
+
+if [ ! -s .test.trp ]; then 
+	echo -ne "\033[1;31;40m"
+	echo "*** NO CODE TO RUN"
+	echo -ne "\033[0m"
+
+	exit 1
+fi
+
+rm -f .test.trp 
+
+# and run
+
+make > /dev/null 
+
+rm -f .errmsg .stdout 
+
+./tripl $beta >& .errmsg > .stdout 
+
+if [ ! -s .errmsg ]; then
+	echo -en "\033[1;32;40m"
+	echo "OK"
+	echo -en "\033[0m"
+	echo "Test finished successfully\n"
+
+	echo "Output: "
+	cat .stdout 
+
+else
+	echo -ne "\033[1;31;40m"
+	echo "Oops! :-("
+	echo -ne "\033[0m"
+	echo "error message: "
+	cat .errmsg
+
+	echo "Debugging $beta"
+	gdb ./tripl  
+fi
+
+rm -f .errmsg .stdout 
+

+ 37 - 17
tripl.c

@@ -100,6 +100,7 @@ ok:	klist_init(&stack);
 	while (next_line(fbuffer)) 
 		parse_line();
 
+
 	if (finish) 
 		finish();
 
@@ -107,6 +108,8 @@ ok:	klist_init(&stack);
 }
 
 
+/* skip the comment, from '# asdf\nasdf2' to 'asdf2' */
+
 static char *__skip_comment(char *fbuffer) {
 	if (*fbuffer != '#') 
 		return fbuffer;
@@ -116,53 +119,70 @@ static char *__skip_comment(char *fbuffer) {
 
 	_skip_spaces(fbuffer);
 
+	if (*fbuffer == '#') 
+		return __skip_comment(fbuffer);
+
 	return fbuffer;
 }
 
 
-/* move line pointer to next line */
-
-static int next_line(char *fbuffer) {
+static int next_line(char *fbuffer __attribute__ ((unused))) {
 	char *p;
-
+	
 	++lno;
 
+	/* first time we call this, initial */
+
 	if (!line_buffer) {
 		p = line_eof = line_buffer = fbuffer = __skip_comment(fbuffer);
 
 		if (fbuffer >= eof) 
+			/* only comment in this file */
 			return 0;
 
+		/* got line_eof */
+
 		while (*p != ';') 
-			line_eof++, p++;
+			p++, line_eof++;
 
 		linebuffer_save = line_buffer;
 
 		return 1;
 	}
 
-	fbuffer = __skip_comment(fbuffer);
+	/* move line_buffer to ';' + 1 and line_eof to line_buffer -> ';' */
 
-	for (; (*line_buffer != ';') && (line_buffer < eof); ++line_buffer);
+	line_buffer = fbuffer = __skip_comment(line_buffer);
 
-	if (line_buffer >= eof) 
+	if (fbuffer >= eof) 
 		return 0;
 
-	p = ++line_buffer;
+	while (*line_buffer != ';') 
+		line_buffer++;
 
-	while (*p != ';' && p < eof) 
-		p++, line_eof++;
 
-	if (p == eof) 
-		/* eof */
-		return 0;
+	line_buffer++;
+
+	/* \n */
+	_skip_spaces(line_buffer)
+
+	line_buffer = __skip_comment(line_buffer);
+
+	line_eof = line_buffer;
+
+	while (*line_eof != ';') 
+		line_eof++;
 
 	linebuffer_save = line_buffer;
 
-	return line_eof++, 1;
+	if (line_buffer >= eof) 
+		return 0;
+
+	return 1;
 }
 
 
+
 static int getnumber(char *p) {
 	int dec = 0, log = 1, neg = 0;
 
@@ -289,9 +309,9 @@ char *getword(char *fbuffer, int *type, int *out) {
 
 				if (ischr(p[-1])) {
 					*type = WORDTYPE_NAME;
-					*out = 1;
+					*out = i;
 
-					return --p;
+					return p - i;
 				}
 			}
 		}