Fix: Sub-type anotation.

Author: dylan-sutton-chavez

compiler/src/modules/parser/stmt.rs

@@ -281,18 +281,24 @@ impl<'src, I: Iterator<Item = Token>> Parser<'src, I> {
     pub(super) fn name_stmt(&mut self, t: Token) -> bool {
         let name = self.lexeme(&t).to_string();
 
-        if self.eat_if(TokenType::Colon) {
-            if matches!(self.peek(), Some(TokenType::Name)) {
-                let ann = {
-                    let t = self.advance();
-                    self.lexeme(&t).to_string()
-                };
-                self.chunk.annotations.insert(name.clone(), ann);
-            }
-            if !matches!(self.peek(), Some(TokenType::Equal)) {
-                return false;
-            }
+    if self.eat_if(TokenType::Colon) {
+        if matches!(self.peek(), Some(TokenType::Name)) {
+            let ann = {
+                let t = self.advance();
+                self.lexeme(&t).to_string()
+            };
+            self.chunk.annotations.insert(name.clone(), ann);
         }
+        while !matches!(
+            self.peek(),
+            Some(TokenType::Equal | TokenType::Dedent | TokenType::Endmarker) | None
+        ) {
+            self.advance();
+        }
+        if !matches!(self.peek(), Some(TokenType::Equal)) {
+            return false;
+        }
+    }
 
         match self.peek() {
             Some(TokenType::Equal) => {

compiler/tests/cases/parser_cases.json

@@ -1625,5 +1625,26 @@
     "names": ["a_0"],
     "instructions": [["LoadName",0], ["LoadConst",0], ["Dup2",0], ["GetItem",0], ["LoadConst",1], ["Add",0], ["StoreItem",0], ["ReturnValue",0]],
     "annotations": {}
+  },
+  {
+    "src": "x: list[int] = [1, 2]",
+    "constants": ["1", "2"],
+    "names": ["x_1"],
+    "instructions": [["LoadConst", 0], ["LoadConst", 1], ["BuildList", 2], ["StoreName", 0], ["ReturnValue", 0]],
+    "annotations": {"x": "list"}
+  },
+  {
+    "src": "x: dict[str, int] = {}",
+    "constants": [],
+    "names": ["x_1"],
+    "instructions": [["BuildDict", 0], ["StoreName", 0], ["ReturnValue", 0]],
+    "annotations": {"x": "dict"}
+  },
+  {
+    "src": "x: tuple[int, str, float] = [1]",
+    "constants": ["1"],
+    "names": ["x_1"],
+    "instructions": [["LoadConst", 0], ["BuildList", 1], ["StoreName", 0], ["ReturnValue", 0]],
+    "annotations": {"x": "tuple"}
   }
 ]

compiler/tests/cases/vm_cases.json

@@ -213,5 +213,8 @@
   {"src": "x = 99999999999999999999\nprint(x)", "output": ["99999999999999999999"], "result": "None"},
   {"src": "scale = 1\nfor _ in range(110):\n    scale = scale * 10\nterm_a = scale // 5\nprint(term_a)", "output": ["20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"], "result": "None"},
   {"src": "x = 42\ndef f():\n    return x\nprint(f())", "output": ["42"], "result": "None"},
-  {"src": "def pi(n):\n    S_num = 0\n    for k in range(n):\n        if k % 2 == 0:\n            S_num = S_num + 1/(2*k + 1)\n        else:\n            S_num = S_num - 1/(2*k + 1)\n    return 4 * S_num\nprint(pi(10))", "output": ["3.0418396189294032"], "result": "None"}
+  {"src": "def pi(n):\n    S_num = 0\n    for k in range(n):\n        if k % 2 == 0:\n            S_num = S_num + 1/(2*k + 1)\n        else:\n            S_num = S_num - 1/(2*k + 1)\n    return 4 * S_num\nprint(pi(10))", "output": ["3.0418396189294032"], "result": "None"},
+  {"src": "a: list[int] = [1, 2, 3]\nprint(a[0])", "output": ["1"], "result": "None"},
+  {"src": "def add(x: int, y: int) -> int:\n    return x + y\nprint(add(3, 4))", "output": ["7"], "result": "None"},
+  {"src": "def greet(name: str) -> str:\n    return 'Hello ' + name\nprint(greet('world'))", "output": ["Hello world"], "result": "None"}
 ]