fix updated defs not being applied properly to VM in frontend and backend

this fixes the case where

	(def botsbuildbots (fn () (botsbuildbots))) (botsbuildbots)

would not run properly (return with a "set def index out of bounds" error)

also make exceptions store String instead of &'static str for better error reporting

closes #33
This commit is contained in:
liquidex 2024-08-22 17:50:44 +02:00
parent ccab723298
commit 3913254215
5 changed files with 27 additions and 8 deletions

View file

@ -328,6 +328,8 @@ unsafe extern "C" fn haku_compile_brush(
}; };
brush.state = BrushState::Ready(chunk_id); brush.state = BrushState::Ready(chunk_id);
instance.vm.apply_defs(&instance.defs);
info!("brush compiled into {chunk_id:?}"); info!("brush compiled into {chunk_id:?}");
StatusCode::Ok StatusCode::Ok

View file

@ -43,8 +43,8 @@ impl<'a> Renderer<'a> {
} }
} }
fn create_exception(_vm: &Vm, _at: Value, message: &'static str) -> Exception { fn create_exception(vm: &Vm, _at: Value, message: &'static str) -> Exception {
Exception { message } vm.create_exception(message)
} }
fn transform(&self) -> Transform { fn transform(&self) -> Transform {

View file

@ -4,7 +4,7 @@ use core::{
iter, iter,
}; };
use alloc::vec::Vec; use alloc::{string::String, vec::Vec};
use crate::{ use crate::{
bytecode::{self, Defs, Opcode, CAPTURE_CAPTURE, CAPTURE_LOCAL}, bytecode::{self, Defs, Opcode, CAPTURE_CAPTURE, CAPTURE_LOCAL},
@ -416,8 +416,10 @@ impl Vm {
} }
} }
pub fn create_exception(&self, message: &'static str) -> Exception { pub fn create_exception(&self, message: impl Into<String>) -> Exception {
Exception { message } Exception {
message: message.into(),
}
} }
pub fn track_array<T>(&mut self, array: &[T]) -> Result<(), Exception> { pub fn track_array<T>(&mut self, array: &[T]) -> Result<(), Exception> {
@ -492,15 +494,15 @@ impl FnArgs {
} }
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Exception { pub struct Exception {
pub message: &'static str, pub message: String,
} }
impl From<bytecode::ReadError> for Exception { impl From<bytecode::ReadError> for Exception {
fn from(_: bytecode::ReadError) -> Self { fn from(_: bytecode::ReadError) -> Self {
Self { Self {
message: "corrupted bytecode", message: "corrupted bytecode".into(),
} }
} }
} }

View file

@ -167,6 +167,19 @@ fn def_mutually_recursive() {
expect_number(code, 14.0, 0.0001); expect_number(code, 14.0, 0.0001);
} }
#[test]
fn def_botsbuildbots() {
let result = eval("(def botsbuildbots (fn () (botsbuildbots))) (botsbuildbots)");
if let Err(error) = result {
assert_eq!(
error.to_string(),
"Exception {\n message: \"too much recursion\",\n}"
);
} else {
panic!("error expected");
}
}
#[test] #[test]
fn let_single() { fn let_single() {
let code = r#" let code = r#"

View file

@ -111,6 +111,8 @@ impl Haku {
let chunk_id = self.system.add_chunk(chunk).context("too many chunks")?; let chunk_id = self.system.add_chunk(chunk).context("too many chunks")?;
self.brush = Some(chunk_id); self.brush = Some(chunk_id);
self.vm.apply_defs(&self.defs);
Ok(()) Ok(())
} }