benerin nested loop

Author: jspmarc

example/hello.vuck

@@ -12,4 +12,6 @@ k108Pj
 k100Pj
 k33Pj
 k10Pj
+k3
+
 :q

example/loop.vuck

@@ -1,23 +1,24 @@
-k3
+k1
 ,
-    k69420p
-    k10P
-    jj
-    k1-
+    k48Pk10Pjjk1-
 F
 j
-k10P
-j
 
-k3
+k2
 ,
     k2
     ,
-        k12345p
-        k10P
-        jj
+        k2
+        ,
+            k12345p
+            k10P
+            jj
+            k1-
+        F
+        j
         k1-
     F
+    j
     k1-
 F
 j

src/interpreter/runner/executor.rs

@@ -80,6 +80,7 @@ impl Runner {
         let (first, second) = {
             if self.stack.len() < 2 {
                 self.error(tok, "Jumlah operand di stack kurang");
+                return;
             }
             let right = self.stack.pop().unwrap();
             let left = self.stack.pop().unwrap();
@@ -99,12 +100,32 @@ impl Runner {
     }
 
     pub fn get_loop_end_idx(&mut self, toks: &[Token], start_idx: usize) -> usize {
-        // cari ujung loopnya dlu di mana
         let mut i = start_idx;
         let rest_of_code = &toks[start_idx..];
+        let mut current_depth = 0;
+
         for tok in rest_of_code {
             i += 1;
             if *tok.get_tok_type() == TokenType::LoopEnd {
+                if current_depth == 0 {
+                    break;
+                } else {
+                    current_depth -= 1;
+                }
+            } else if *tok.get_tok_type() == TokenType::LoopStart {
+                current_depth += 1;
+            }
+        }
+
+        i
+    }
+
+    pub fn get_else_branch_idx(&mut self, toks: &[Token], start_idx: usize) -> usize {
+        let mut i = start_idx;
+        let rest_of_code = &toks[start_idx..];
+        for tok in rest_of_code {
+            i += 1;
+            if *tok.get_tok_type() == TokenType::ConditionalEnd {
                 break;
             }
         }

src/interpreter/runner/mod.rs

@@ -13,7 +13,6 @@ struct Runner {
     stack: Vec<i32>,
     ptr_idx: i32,
     had_error: bool,
-    count_loop: isize,
     count_conditional: isize,
 }
 
@@ -32,16 +31,10 @@ impl Runner {
             return Ok(()); // kaborr
         }
 
-        {
-            // println!("Token [");
-            // for (i, tok) in toks.into_iter().enumerate() {
-            //     println!("\t{}: \t{:?}", i, tok);
-            // }
-            // println!("]");
-        }
-
         // run
-        self.the_actual_runner_lol(toks)
+        let _ = self.the_actual_runner_lol(toks);
+
+        Ok(())
     }
 
     fn the_actual_runner_lol(&mut self, toks: &[Token]) -> io::Result<()> {
@@ -75,32 +68,31 @@ impl Runner {
                     }
 
                     // cari akhir di mana
-                    // eksekusi sampe stack-nya 0
                     let start_idx = i + 1;
                     let end_idx = self.get_loop_end_idx(toks, start_idx);
 
-                    self.count_loop += 1;
-
-                    let banyak_muter_nya = self.stack[self.ptr_idx as usize];
-                    for _ in 0..banyak_muter_nya {
+                    // nge-run kode loop
+                    // eksekusi sampe stack-nya 0
+                    while !self.is_at_loop_end() {
                         let _ = self.the_actual_runner_lol(&toks[(start_idx - 1)..end_idx]);
                     }
 
-                    // skip to end
+                    // skip to loop end
                     let mut tmp_tok = tok_iter.next().unwrap();
-                    while *tmp_tok.get_tok_type() != TokenType::LoopEnd {
+                    while *tmp_tok.get_tok_type() != TokenType::LoopEnd || i != (end_idx - 1) {
                         tmp_tok = tok_iter.next().unwrap();
                         i += 1;
                     }
+                    i += 1;
                 }
                 TokenType::LoopEnd => {
-                    if self.count_loop > 0 && self.is_at_loop_end() {
-                        self.count_loop -= 1;
+                    if self.is_at_loop_end() {
+                        return Ok(());
                     }
                 }
-                TokenType::ConditionalStart => todo!(),
-                TokenType::ConditionalEnd => todo!(),
-                TokenType::ConditionalElse => todo!(),
+                TokenType::ConditionalStart => println!("Masuk ke conditional"),
+                TokenType::ConditionalElse => println!("Branch else"),
+                TokenType::ConditionalEnd => println!("Akhir conditional"),
                 TokenType::Number => self.error(tok, "Kok tiba-tiba angka, mas/mba!"),
             }
 
@@ -116,7 +108,6 @@ pub fn run(source: &str) -> io::Result<()> {
         stack: vec![],
         ptr_idx: -1,
         had_error: HAD_ERROR.load(Ordering::SeqCst),
-        count_loop: 0,
         count_conditional: 0,
     };