Algo-tests, fix break statement

ParfenovIgor · Dec 30, 2024 · 2ce8390 · 2ce8390
1 parent 6ecf5d3
commit 2ce8390
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 45 deletions.
diff --git a/altlib/stdio.al b/altlib/stdio.al
@@ -59,6 +59,11 @@ func ^.atoi_(str #1C) -> #I {
     return x
 }
 
+func ^.freadc_(fd #I) -> #C {
+    def c := '\0'
+    return if (posix_read(fd, c&, 1) = 0) '\0' else c
+}
+
 func ^.freads_(fd #I, dst #1C) -> #I {
     def i := 0
     def dsti := dst as #I
@@ -80,17 +85,31 @@ func ^.freads_(fd #I, dst #1C) -> #I {
     return i
 }
 
-func ^.freadi_(fd #I, dst #1C) -> #I {
-    eval freads_(fd, dst)
-    return atoi_(dst)
+func ^.freadi_(fd #I) -> #I {
+    def x := 0
+    def start := 0
+    return while (1) {
+        def c := freadc_(fd)
+        eval if ((c = ' ' or c = '\n') and start = 0) { continue }
+        start := 1
+        eval if (not (c >= '0' and c <= '9')) { break x }
+        def d := (c - '0') as #I
+        x := x * 10 + d
+    }
+    else 0
 }
 
 func ^.reads_(dst #1C) -> #I {
     def STDIN := 0
     return freads_(STDIN, dst)
 }
 
-func ^.readi_(dst #1C) -> #I {
+func ^.readc_() -> #C {
+    def STDIN := 0
+    return freadc_(STDIN)
+}
+
+func ^.readi_() -> #I {
     def STDIN := 0
-    return freadi_(STDIN, dst)
+    return freadi_(STDIN)
 }
diff --git a/compiler/src/compile.c b/compiler/src/compile.c
@@ -496,6 +496,12 @@ void compile_break(struct Node *node, struct Break *this, struct CPContext *cont
             error_semantic("Break values types do not equal", node);
         }
     }
+
+    int tsize = type_size(_type, context);
+    const char *dst = _concat3("[rbp + ", _itoa(label_info->sf_pos - align_to_word(tsize)), "]");
+    const char *src = _concat3("[rbp + ", _itoa(context->sf_pos - align_to_word(tsize)), "]");
+    compile_memcpy(dst, src, tsize, context);
+
     _fputsi(context->fd_text, "add rsp, ", label_info->sf_pos - context->sf_pos, "\n");
     _fputs3(context->fd_text, "jmp ", label_info->name_end, "\n");
 }
@@ -953,7 +959,7 @@ struct TypeNode *compile_and(struct Node *node, struct BinaryOperator *this, str
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 0\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_or(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -972,7 +978,7 @@ struct TypeNode *compile_or(struct Node *node, struct BinaryOperator *this, stru
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_not(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -988,7 +994,7 @@ struct TypeNode *compile_not(struct Node *node, struct BinaryOperator *this, str
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_bitwise_and(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1097,7 +1103,7 @@ struct TypeNode *compile_less(struct Node *node, struct BinaryOperator *this, st
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_greater(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1112,7 +1118,7 @@ struct TypeNode *compile_greater(struct Node *node, struct BinaryOperator *this,
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_equal(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1127,7 +1133,7 @@ struct TypeNode *compile_equal(struct Node *node, struct BinaryOperator *this, s
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_less_equal(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1142,7 +1148,7 @@ struct TypeNode *compile_less_equal(struct Node *node, struct BinaryOperator *th
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_greater_equal(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1157,7 +1163,7 @@ struct TypeNode *compile_greater_equal(struct Node *node, struct BinaryOperator
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_not_equal(struct Node *node, struct BinaryOperator *this, struct CPContext *context) {
@@ -1172,7 +1178,7 @@ struct TypeNode *compile_not_equal(struct Node *node, struct BinaryOperator *thi
     _fputsi(context->fd_text, "_L", idx, ":\n");
     _fputs(context->fd_text, "mov qword [rsp - 8], 1\n");
     _fputsi(context->fd_text, "_L", idx + 1, ":\n");
-    return _type;
+    return context->node_int;
 }
 
 struct TypeNode *compile_node(struct Node *node, struct CPContext *context) {

diff --git a/compiler/src/syntax.c b/compiler/src/syntax.c
@@ -353,7 +353,7 @@ struct Node *syntax_process_expression(struct TokenStream *ts, struct Settings *
             CurrentState = State_ParenthesisOpen;
         }
         else if (tokenstream_get(ts).type == TokenParenthesisClose) {
-            if (CurrentState != State_Identifier) {
+            if (CurrentState != State_Identifier && CurrentState != State_ParenthesisClose) {
                 error_syntax("Unexpected ) in expression", tokenstream_get(ts));
             }
             while (vsize(&operations) != NULL && ((struct Token*)vback(&operations))->type != TokenParenthesisOpen) {

diff --git a/test/algo/Makefile b/test/algo/Makefile
@@ -1,17 +1,13 @@
 ALFLAGS=-i altlib ../../altlib/
 LDFLAGS=-z noexecstack
 
-SRCS_AL := $(wildcard *.al)
-EXES_AL := $(patsubst %.al, $(BUILD_DIR)/test/algo/%, $(SRCS_AL))
+SRCS_AL := $(wildcard */main.al)
+DIRS := $(patsubst %/main.al, $(BUILD_DIR)/test/algo/%, $(SRCS_AL))
 
-OBJS_STDLIB := $(wildcard $(BUILD_DIR)/stdlib/*.o)
-OBJS_ALTLIB := $(wildcard $(BUILD_DIR)/altlib/*.o)
+all: $(DIRS)
 
-all: $(EXES_AL)
-
-$(BUILD_DIR)/test/algo/%: %.al make_dir
-	$(BUILD_DIR)/calias -a $(ALFLAGS) $< -o $(patsubst %, %.o, $@)
-	ld $(LDFLAGS) -o $@ $(patsubst %, %.o, $@) $(OBJS_STDLIB) $(OBJS_ALTLIB)
+$(BUILD_DIR)/test/algo/%: % make_dir
+	$(MAKE) -C $< BUILD_DIR=$(BUILD_DIR) WORKING_DIR=$(BUILD_DIR)/test/algo/$<
 
 make_dir:
 	mkdir -p $(BUILD_DIR)/test/algo

diff --git a/test/algo/a_plus_b.al b/test/algo/a_plus_b.al
diff --git a/test/algo/a_plus_b/Makefile b/test/algo/a_plus_b/Makefile
@@ -0,0 +1,28 @@
+ALFLAGS=-i altlib ../../../altlib/
+LDFLAGS=-z noexecstack
+
+SRCS_AL := $(wildcard *.al)
+EXES_AL := $(patsubst %.al, $(BUILD_DIR)/test/integration/%, $(SRCS_AL))
+
+TESTS_IN := $(wildcard in/*)
+TESTS_OUT := $(wildcard out/*)
+TESTS_OUT2 := $(patsubst out/%, $(WORKING_DIR)/out/%, $(TESTS_OUT))
+
+OBJS_STDLIB := $(wildcard $(BUILD_DIR)/stdlib/*.o)
+OBJS_ALTLIB := $(wildcard $(BUILD_DIR)/altlib/*.o)
+
+all: $(WORKING_DIR)/main $(TESTS_OUT2)
+
+$(WORKING_DIR)/main: main.al make_dir
+	$(BUILD_DIR)/calias -a $(ALFLAGS) $< -o $(patsubst %, %.o, $@)
+	ld $(LDFLAGS) -o $@ $(patsubst %, %.o, $@) $(OBJS_STDLIB) $(OBJS_ALTLIB)
+
+$(WORKING_DIR)/out/%: in/% $(WORKING_DIR)/main
+	$(WORKING_DIR)/main < $< > $@
+	diff $@ $(patsubst in/%, out/%, $<) || (echo "Test failed"; exit 1)
+
+make_dir:
+	mkdir -p $(WORKING_DIR)/out
+
+clean:
+	rm -r $(BUILD_DIR)
diff --git a/test/algo/a_plus_b/in/1 b/test/algo/a_plus_b/in/1
@@ -0,0 +1 @@
+2 3
diff --git a/test/algo/a_plus_b/in/2 b/test/algo/a_plus_b/in/2
@@ -0,0 +1 @@
+43 58
diff --git a/test/algo/a_plus_b/in/3 b/test/algo/a_plus_b/in/3
@@ -0,0 +1,7 @@
+
+
+     5943    
+
+
+
+ 49789   
diff --git a/test/algo/a_plus_b/main.al b/test/algo/a_plus_b/main.al
@@ -0,0 +1,7 @@
+include altlib."posix.al"
+include altlib."stdio.al"
+
+func ^._start() -> #V {
+    eval puti_(readi_() + readi_())
+    eval posix_exit(0)
+}
diff --git a/test/algo/a_plus_b/out/1 b/test/algo/a_plus_b/out/1
@@ -0,0 +1 @@
+5
diff --git a/test/algo/a_plus_b/out/2 b/test/algo/a_plus_b/out/2
@@ -0,0 +1 @@
+101
diff --git a/test/algo/a_plus_b/out/3 b/test/algo/a_plus_b/out/3
@@ -0,0 +1 @@
+55732
diff --git a/test/algo/read_write_string/Makefile b/test/algo/read_write_string/Makefile
@@ -0,0 +1,28 @@
+ALFLAGS=-i altlib ../../../altlib/
+LDFLAGS=-z noexecstack
+
+SRCS_AL := $(wildcard *.al)
+EXES_AL := $(patsubst %.al, $(BUILD_DIR)/test/integration/%, $(SRCS_AL))
+
+TESTS_IN := $(wildcard in/*)
+TESTS_OUT := $(wildcard out/*)
+TESTS_OUT2 := $(patsubst out/%, $(WORKING_DIR)/out/%, $(TESTS_OUT))
+
+OBJS_STDLIB := $(wildcard $(BUILD_DIR)/stdlib/*.o)
+OBJS_ALTLIB := $(wildcard $(BUILD_DIR)/altlib/*.o)
+
+all: $(WORKING_DIR)/main $(TESTS_OUT2)
+
+$(WORKING_DIR)/main: main.al make_dir
+	$(BUILD_DIR)/calias -a $(ALFLAGS) $< -o $(patsubst %, %.o, $@)
+	ld $(LDFLAGS) -o $@ $(patsubst %, %.o, $@) $(OBJS_STDLIB) $(OBJS_ALTLIB)
+
+$(WORKING_DIR)/out/%: in/% $(WORKING_DIR)/main
+	$(WORKING_DIR)/main < $< > $@
+	diff $@ $(patsubst in/%, out/%, $<) || (echo "Test failed"; exit 1)
+
+make_dir:
+	mkdir -p $(WORKING_DIR)/out
+
+clean:
+	rm -r $(BUILD_DIR)
diff --git a/test/algo/read_write_string/in/1 b/test/algo/read_write_string/in/1
@@ -0,0 +1 @@
+Hello
diff --git a/test/algo/read_write_string/in/2 b/test/algo/read_write_string/in/2
@@ -0,0 +1,2 @@
+
+    abacaba   
diff --git a/test/algo/read_write_string.al → test/algo/read_write_string/main.al b/test/algo/read_write_string.al → test/algo/read_write_string/main.al
diff --git a/test/algo/read_write_string/out/1 b/test/algo/read_write_string/out/1
@@ -0,0 +1 @@
+Hello
diff --git a/test/algo/read_write_string/out/2 b/test/algo/read_write_string/out/2
@@ -0,0 +1 @@
+abacaba