refactor: 拆分 Kernel 中可变 Session 与不可变 Core
This commit is contained in:
@@ -37,7 +37,7 @@ fn eval_val(source: &str) -> (Vm, Result<JsValue, String>) {
|
||||
|
||||
fn to_str(vm: &Vm, val: JsValue) -> String {
|
||||
if val.is_string() {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
} else {
|
||||
format!("{}", val)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn str_val(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// -- direct native fn tests --
|
||||
@@ -25,7 +25,7 @@ fn bool_ctor_call(vm: &mut Vm, arg: JsValue) -> JsValue {
|
||||
}
|
||||
|
||||
fn bool_ctor_new(vm: &mut Vm, arg: JsValue) -> JsValue {
|
||||
let proto_ptr = vm.kernel().builtin_world().boolean_proto.as_ptr() as *mut JsObject;
|
||||
let proto_ptr = vm.session().builtin_world().boolean_proto.as_ptr() as *mut JsObject;
|
||||
let wrapper = JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::from_js_object(proto_ptr));
|
||||
let ptr = vm.epoch().alloc(wrapper);
|
||||
let val = JsValue::from_js_object(ptr);
|
||||
|
||||
@@ -9,7 +9,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<oxide_types::value::JsValue, String
|
||||
}
|
||||
|
||||
fn str_val(vm: &Vm, val: oxide_types::value::JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// -- static methods --
|
||||
|
||||
@@ -34,7 +34,7 @@ fn function_bind_creates_wrapper() {
|
||||
fn function_constructor_is_global() {
|
||||
let mut vm = Vm::new();
|
||||
let result = eval(&mut vm, "typeof Function").unwrap();
|
||||
let rendered = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let rendered = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(rendered, "function");
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ fn function_to_string_includes_function() {
|
||||
let mut vm = Vm::new();
|
||||
let result = eval(&mut vm, "Math.max.toString()").unwrap();
|
||||
assert!(result.is_string());
|
||||
let rendered = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let rendered = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(rendered, "function max() { [native code] }");
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn str_val(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// -- direct native fn tests --
|
||||
|
||||
@@ -76,7 +76,7 @@ fn number_constructor() {
|
||||
fn to_string_of_number() {
|
||||
let mut vm = Vm::new();
|
||||
let result = eval(&mut vm, "var n = 42; n.toString()").unwrap();
|
||||
let s = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let s = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(s, "42");
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ fn to_string_of_number() {
|
||||
fn to_fixed_of_number() {
|
||||
let mut vm = Vm::new();
|
||||
let result = eval(&mut vm, "var n = 3.14159; n.toFixed(2)").unwrap();
|
||||
let s = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let s = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(s, "3.14");
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ fn number_epsilon_is_positive() {
|
||||
fn number_to_exponential() {
|
||||
let mut vm = Vm::new();
|
||||
let result = eval(&mut vm, "var n = 123.456; n.toExponential(2)").unwrap();
|
||||
let s = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let s = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(s, "1.23e2");
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ fn object_assign_copies() {
|
||||
fn object_assign_boxes_primitive_target() {
|
||||
let (_vm, result) = eval("var result = Object.assign('a'); result.valueOf()").unwrap();
|
||||
assert!(result.is_string());
|
||||
let rendered = _vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let rendered = _vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(rendered, "a");
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn to_str(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// --- RegExp constructor ---
|
||||
|
||||
@@ -10,7 +10,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn to_str(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -10,7 +10,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn to_str(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// --- Symbol constructor ---
|
||||
|
||||
@@ -86,13 +86,13 @@ fn test_strict_equality_null_undefined() {
|
||||
#[test]
|
||||
fn test_to_int32_and_to_uint32() {
|
||||
let vm = Vm::new();
|
||||
let sf = vm.kernel().string_forge().as_ref();
|
||||
let sf = vm.kernel_core().string_forge().as_ref();
|
||||
let string_three = {
|
||||
let (idx, hash) = vm.kernel().string_forge().intern("3");
|
||||
let (idx, hash) = vm.kernel_core().string_forge().intern("3");
|
||||
JsValue::string(idx, hash)
|
||||
};
|
||||
let string_bad = {
|
||||
let (idx, hash) = vm.kernel().string_forge().intern("x");
|
||||
let (idx, hash) = vm.kernel_core().string_forge().intern("x");
|
||||
JsValue::string(idx, hash)
|
||||
};
|
||||
|
||||
|
||||
@@ -204,6 +204,6 @@ fn function_default_prototype_accepts_member_assignment() {
|
||||
"function Test262Error(message) { this.message = message || ''; } Test262Error.prototype.toString = function () { return this.message; }; new Test262Error('ok').toString()",
|
||||
)
|
||||
.unwrap();
|
||||
let rendered = vm.kernel().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
let rendered = vm.kernel_core().string_forge().lookup(result.as_string_index()).unwrap_or_default();
|
||||
assert_eq!(rendered, "ok");
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ fn eval(vm: &mut Vm, source: &str) -> Result<JsValue, String> {
|
||||
}
|
||||
|
||||
fn string_value(vm: &Vm, val: JsValue) -> String {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
}
|
||||
|
||||
// -- JSON.parse --
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use oxide_compiler::compiler::Compiler;
|
||||
use oxide_kernel::kernel::{KernelConfig, OxideKernel};
|
||||
use oxide_kernel::kernel::{KernelConfig, KernelCore};
|
||||
use oxide_parser::Allocator;
|
||||
use oxide_vm::vm::Vm;
|
||||
|
||||
@@ -22,7 +22,7 @@ fn eval(source: &str) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
fn eval_with_kernel(source: &str, kernel: Arc<OxideKernel>) -> String {
|
||||
fn eval_with_kernel(source: &str, kernel: Arc<KernelCore>) -> String {
|
||||
let allocator = Allocator::default();
|
||||
let program = match oxide_parser::parse(&allocator, source) {
|
||||
Ok(p) => p,
|
||||
@@ -32,7 +32,7 @@ fn eval_with_kernel(source: &str, kernel: Arc<OxideKernel>) -> String {
|
||||
Ok(m) => m,
|
||||
Err(e) => return format!("compile error: {e}"),
|
||||
};
|
||||
let mut vm = Vm::with_kernel(kernel);
|
||||
let mut vm = Vm::with_kernel_core(kernel);
|
||||
match vm.run(&module) {
|
||||
Ok(result) => format!("{result}"),
|
||||
Err(e) => format!("vm error: {e}"),
|
||||
@@ -108,7 +108,7 @@ fn regression_for_in_prototype_chain() {
|
||||
fn regression_vm_step_limit_is_configurable() {
|
||||
let mut config = KernelConfig::minimal();
|
||||
config.max_steps = Some(5);
|
||||
let kernel = Arc::new(OxideKernel::new(config));
|
||||
let kernel = KernelCore::new(config);
|
||||
let result = eval_with_kernel("while (true) {}", kernel);
|
||||
assert!(
|
||||
result.contains("VM step limit exceeded"),
|
||||
|
||||
@@ -37,7 +37,7 @@ fn eval_val(source: &str) -> (Vm, Result<JsValue, String>) {
|
||||
|
||||
fn to_str(vm: &Vm, val: JsValue) -> String {
|
||||
if val.is_string() {
|
||||
vm.kernel().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
vm.kernel_core().string_forge().lookup(val.as_string_index()).unwrap_or_default()
|
||||
} else {
|
||||
format!("{}", val)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user