feat(vixc) del <> for generic syntax , use :[]

Author: Daweidie

vixc0/lexer.vix

@@ -75,13 +75,12 @@ pub fn stream_col_at(stream: TokenStream, index: i32): i32
 
 pub fn peek_char(src: string, pos: i32): ?i8
 {
-    if (pos < 0 or pos >= src.length)
+    if (pos < 0 or src.length <= pos)
     {
         return None
     }
     return Some(src[pos])
 }
-
 pub fn is_alpha(c: i8): i32
 {
     if ((c >= 'a' and c <= 'z') or (c >= 'A' and c <= 'Z') or c == '_') { return 1 }
@@ -108,6 +107,55 @@ pub fn char_string(c: i8): string
     return s
 }
 
+pub fn token_can_end_statement(kind: i32, text: string): i32
+{
+    if (kind == tk_ident() or kind == tk_number() or kind == tk_string() or kind == tk_bool()) { return 1 }
+    if (text == ")" or text == "]" or text == "}" or text == "break" or text == "continue" or text == "return") { return 1 }
+    return 0
+}
+
+pub fn next_non_space_char(src: string, pos: i32): ?i8
+{
+    let mut i = pos
+    while (i < src.length)
+    {
+        if (src[i] == ' ' or src[i] == '\t' or src[i] == '\r' or src[i] == '\n')
+        {
+            i += 1
+        }
+        elif (src[i] == '/' and i + 1 < src.length and src[i + 1] == '/')
+        {
+            while (i < src.length and src[i] != '\n') { i += 1 }
+        }
+        else
+        {
+            return Some(src[i])
+        }
+    }
+    return None
+}
+
+pub fn newline_should_insert_semicolon(src: string, pos: i32, stream: TokenStream): i32
+{
+    if (stream_len(stream) == 0) { return 0 }
+    let last = stream_len(stream) - 1
+    if (token_can_end_statement(stream_kind_at(stream, last), stream_text_at(stream, last)) == 0) { return 0 }
+    let result = match next_non_space_char(src, pos) {
+        Some(c) -> {
+            if (c == '}' or c == '"' or is_alpha(c) == 1 or is_digit(c) == 1)
+            {
+                1
+            }
+            else
+            {
+                0
+            }
+        }
+        None -> 0
+    }
+    return result
+}
+
 pub fn is_keyword(text: string): i32
 {
     return match text {
@@ -139,6 +187,10 @@ pub fn tokenize(src: string): TokenStream
                 elif (c == '\n')
                 {
                     pos += 1
+                    if (newline_should_insert_semicolon(src, pos, stream) == 1)
+                    {
+                        stream_push(&stream, tk_symbol(), ";", 0, line, column)
+                    }
                     line += 1
                     column = 1
                 }

vixc0/main.vix

@@ -3,9 +3,47 @@ import "parser.vix"
 import "ast.vix"
 import "codegen.vix"
 
+extern "C"
+{
+    fn fopen(filename: ptr, mode: ptr): ptr
+    fn fclose(file: ptr): i32
+    fn fread(buf: ptr, size: i64, count: i64, file: ptr): i64
+    fn fseek(file: ptr, offset: i64, whence: i32): i32
+    fn ftell(file: ptr): i64
+    fn malloc(size: usize): string
+}
+
+fn string_ends_with(text: string, suffix: string): i32
+{
+    if (text.length < suffix.length) { return 0 }
+    let offset = text.length - suffix.length
+    for (i in 0 .. suffix.length)
+    {
+        if (text[offset + i] != suffix[i]) { return 0 }
+    }
+    return 1
+}
+
+fn read_source_file(path: ptr): string
+{
+    let file = fopen(path, "r")
+    if (file == 0)
+    {
+        return ""
+    }
+    fseek(file, 0, 2)
+    let size = ftell(file)
+    fseek(file, 0, 0)
+    let buf = malloc(size + 1)
+    let n = fread(buf, 1, size, file)
+    buf[n] = 0
+    fclose(file)
+    return buf
+}
+
 fn main(argc: i32, argv: ptr): i32
 {
-    let mut src = "fn main():i32 { let a = 10 let b = 20 let c = 30 return 0 }"
+    let mut src = "fn main():i32 { let a = 10; let b = 20; let c = 30; printf(a); if (a < 100) { printf(a); } return 0 }"
     let mut mode = "codegen"
 
     if (argc > 1)
@@ -15,6 +53,10 @@ fn main(argc: i32, argv: ptr): i32
     if (argc > 2)
     {
         src = argv[2]
+        if (string_ends_with(src, ".vix") == 1)
+        {
+            src = read_source_file(argv[2])
+        }
     }
 
     if (mode == "--lex")

vixc0/parser.vix

@@ -180,6 +180,7 @@ pub fn parse_unary(parser: &Parser): i32
         }
         _ -> parse_primary(parser)
     }
+    
     return result
 }