From 09f2292e62583d230eca356f7ce9dbc07e4c240d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=AA=E3=82=AD=E8=90=8C?= Date: Mon, 1 Sep 2025 21:13:32 +0200 Subject: [PATCH] remove leftover limits from haku-wasm --- crates/haku-wasm/src/lib.rs | 20 +------------------- static/haku.js | 11 ++++++++--- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/crates/haku-wasm/src/lib.rs b/crates/haku-wasm/src/lib.rs index 33cbec9..8459dc6 100644 --- a/crates/haku-wasm/src/lib.rs +++ b/crates/haku-wasm/src/lib.rs @@ -6,7 +6,7 @@ use core::{alloc::Layout, mem, ptr, slice}; use alloc::{boxed::Box, string::String, vec::Vec}; use haku::{ - ast::Ast, + ast::{self, Ast}, bytecode::{Chunk, Defs, DefsImage, DefsLimits}, compiler::{compile_expr, ClosureSpec, CompileError, Compiler, Source}, diagnostic::Diagnostic, @@ -48,12 +48,6 @@ struct Limits { max_parser_events: usize, ast_capacity: usize, chunk_capacity: usize, - stack_capacity: usize, - call_stack_capacity: usize, - ref_capacity: usize, - fuel: usize, - memory: usize, - render_max_depth: usize, } impl Default for Limits { @@ -67,12 +61,6 @@ impl Default for Limits { max_parser_events: 1024, ast_capacity: 1024, chunk_capacity: 65536, - stack_capacity: 1024, - call_stack_capacity: 256, - ref_capacity: 2048, - fuel: 65536, - memory: 1024 * 1024, - render_max_depth: 256, } } } @@ -112,12 +100,6 @@ limit_setter!(max_tokens); limit_setter!(max_parser_events); limit_setter!(ast_capacity); limit_setter!(chunk_capacity); -limit_setter!(stack_capacity); -limit_setter!(call_stack_capacity); -limit_setter!(ref_capacity); -limit_setter!(fuel); -limit_setter!(memory); -limit_setter!(render_max_depth); #[derive(Debug, Clone)] struct Instance { diff --git a/static/haku.js b/static/haku.js index 69d1b0f..a9532d0 100644 --- a/static/haku.js +++ b/static/haku.js @@ -217,9 +217,14 @@ export class Haku { console.groupCollapsed("construct Haku"); { let pLimits = allocCheck(w.haku_limits_new()); - for (let name of Object.keys(limits)) { - w[`haku_limits_set_${name}`](pLimits, limits[name]); - } + w.haku_limits_set_max_source_code_len(pLimits, limits.max_source_code_len); + w.haku_limits_set_max_chunks(pLimits, limits.max_chunks); + w.haku_limits_set_max_defs(pLimits, limits.max_defs); + w.haku_limits_set_max_tags(pLimits, limits.max_tags); + w.haku_limits_set_max_tokens(pLimits, limits.max_tokens); + w.haku_limits_set_max_parser_events(pLimits, limits.max_parser_events); + w.haku_limits_set_ast_capacity(pLimits, limits.ast_capacity); + w.haku_limits_set_chunk_capacity(pLimits, limits.chunk_capacity); this.#pInstance = allocCheck(w.haku_instance_new(pLimits));