release "if" demo as 0.2.0-a1

Author: tiye

.github/workflows/publish.yaml

@@ -16,13 +16,16 @@ jobs:
           toolchain: nightly
           components: clippy
 
+      - run: cargo test
+
       - run: cargo run -- -s demos/hello.cirru
       - run: cargo run -- -s demos/sum.cirru
       - run: cargo run -- -s demos/assert.cirru
       - run: cargo run -- -s demos/nested.cirru
       - run: cargo run -- -s demos/named.cirru
       - run: cargo run -- -s demos/recur.cirru
       - run: cargo run -- -s demos/fibonacci.cirru
+      - run: cargo run -- -s demos/if.cirru
       - run: cargo run -- --emit-binary target/a.calx demos/named.cirru && cargo run -- --eval-binary target/a.calx
 
       # - run: cargo test

.github/workflows/test.yaml

@@ -24,17 +24,19 @@ jobs:
           toolchain: nightly
           components: clippy
 
+      - run: cargo test
+
       - run: cargo run -- -s demos/hello.cirru
       - run: cargo run -- -s demos/sum.cirru
       - run: cargo run -- -s demos/assert.cirru
       - run: cargo run -- -s demos/nested.cirru
       - run: cargo run -- -s demos/named.cirru
       - run: cargo run -- -s demos/recur.cirru
       - run: cargo run -- -s demos/fibonacci.cirru
+      - run: cargo run -- -s demos/if.cirru
       - run: cargo run -- --emit-binary target/a.calx demos/named.cirru && cargo run -- --eval-binary target/a.calx
 
       - uses: giraffate/clippy-action@v1
         with:
           reporter: 'github-pr-review'
           github_token: ${{ secrets.GITHUB_TOKEN }}
-

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calx_vm"
-version = "0.1.6"
+version = "0.2.0-a1"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2021"
 license = "MIT"

README.md

@@ -73,6 +73,8 @@ fn main ()
 
 ### Instructions
 
+> _TODO_ update to `0.2.x`...
+
 Highly inspired by:
 
 - WASM https://github.com/WebAssembly/design/blob/main/Semantics.md

demos/if.cirru

@@ -1,11 +1,19 @@
 
-
 fn main ()
   const 1
+  call demo
+  const 0
+  call demo
+
+fn demo (($a i64) ->)
+  local.get $a
+
   if (->)
     do
       const 11
       echo
     do
       const 20
       echo
+  const 3
+  echo

src/vm.rs

@@ -703,7 +703,6 @@ impl CalxVM {
             if stack_size < 1 {
               return Err(format!("insufficient stack {} to branch", stack_size));
             }
-            stack_size -= 1;
 
             blocks_track.push(BlockData::If {
               ret_types: ret_types.to_owned(),
@@ -712,6 +711,7 @@ impl CalxVM {
               initial_stack_size: stack_size,
             });
 
+            stack_size -= 1;
             ops.push(CalxInstr::JmpIf(else_at.to_owned()));
           }
           CalxSyntax::ElseEnd => {
@@ -720,6 +720,7 @@ impl CalxVM {
             }
 
             let prev_block = blocks_track.peek_if()?;
+
             if stack_size != prev_block.expected_finish_size() {
               return Err(format!("size mismatch for else-end: {} {:?}", stack_size, prev_block));
             }

tests/parser_tests.rs

@@ -36,37 +36,5 @@ fn test_extracting() -> Result<(), String> {
     ))
   );
 
-  assert_eq!(
-    Cirru::List(extract_nested(&Cirru::List(vec![
-      Cirru::leaf("block"),
-      Cirru::List(vec![
-        Cirru::leaf("c"),
-        Cirru::leaf("d"),
-        Cirru::List(vec![Cirru::leaf("e"), Cirru::leaf("f"),])
-      ])
-    ]))?),
-    Cirru::List(vec!(Cirru::List(vec![
-      Cirru::leaf("block"),
-      Cirru::List(vec![Cirru::leaf("e"), Cirru::leaf("f")]),
-      Cirru::List(vec![Cirru::leaf("c"), Cirru::leaf("d")])
-    ]),))
-  );
-
-  assert_eq!(
-    Cirru::List(extract_nested(&Cirru::List(vec![
-      Cirru::leaf("loop"),
-      Cirru::List(vec![
-        Cirru::leaf("c"),
-        Cirru::leaf("d"),
-        Cirru::List(vec![Cirru::leaf("e"), Cirru::leaf("f"),])
-      ])
-    ]))?),
-    Cirru::List(vec!(Cirru::List(vec![
-      Cirru::leaf("loop"),
-      Cirru::List(vec![Cirru::leaf("e"), Cirru::leaf("f")]),
-      Cirru::List(vec![Cirru::leaf("c"), Cirru::leaf("d")])
-    ]),))
-  );
-
   Ok(())
 }