Make all native props and funcs overridable by default

wasmerio · Feb 22, 2024 · 01184df · 01184df
1 parent b18a366
commit 01184df
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 14 deletions.
diff --git a/ion-proc/src/attribute/name.rs b/ion-proc/src/attribute/name.rs
@@ -35,7 +35,7 @@ impl Name {
 						attrs: Vec::new(),
 						lit: Lit::Str(LitStr::new(&name, literal.span())),
 					})),
-					parse_quote!(#ion::flags::PropertyFlags::CONSTANT_ENUMERATED),
+					parse_quote!(#ion::flags::PropertyFlags::ENUMERATE),
 				)
 			}
 			Name::Symbol(symbol) => {

diff --git a/ion-proc/src/class/method.rs b/ion-proc/src/class/method.rs
@@ -47,7 +47,7 @@ impl Method {
 					if name.is_case(Case::Snake) {
 						name = name.to_case(Case::Camel)
 					}
-					quote!(#ion::function_spec!(#class::#ident, #name, #nargs, #ion::flags::PropertyFlags::CONSTANT_ENUMERATED))
+					quote!(#ion::function_spec!(#class::#ident, #name, #nargs, #ion::flags::PropertyFlags::ENUMERATE))
 				}
 				Name::Symbol(symbol) => {
 					quote!(#ion::function_spec_symbol!(#class::#ident, #symbol, #nargs, #ion::flags::PropertyFlags::CONSTANT))

diff --git a/ion/src/spec/function.rs b/ion/src/spec/function.rs
@@ -52,12 +52,7 @@ macro_rules! function_spec {
 		)
 	};
 	($function:expr, $name:expr, $nargs:expr) => {
-		function_spec!(
-			$function,
-			$name,
-			$nargs,
-			$crate::flags::PropertyFlags::CONSTANT_ENUMERATED
-		)
+		function_spec!($function, $name, $nargs, $crate::flags::PropertyFlags::ENUMERATE)
 	};
 	($function:expr, $nargs:expr) => {
 		function_spec!($function, ::std::stringify!($function), $nargs)
@@ -83,7 +78,7 @@ macro_rules! function_spec_symbol {
 			$function,
 			$symbol,
 			$nargs,
-			$crate::flags::PropertyFlags::CONSTANT_ENUMERATED
+			$crate::flags::PropertyFlags:ENUMERATE:
 		)
 	};
 }
diff --git a/modules/src/path/path.rs b/modules/src/path/path.rs
@@ -121,8 +121,8 @@ const FUNCTIONS: &[JSFunctionSpec] = &[
 ];
 
 const PROPERTIES: &[JSPropertySpec] = &[
-	create_property_spec_string("separator", SEPARATOR, PropertyFlags::CONSTANT_ENUMERATED),
-	create_property_spec_string("delimiter", DELIMITER, PropertyFlags::CONSTANT_ENUMERATED),
+	create_property_spec_string("separator", SEPARATOR, PropertyFlags::ENUMERATE),
+	create_property_spec_string("delimiter", DELIMITER, PropertyFlags::ENUMERATE),
 	JSPropertySpec::ZERO,
 ];
 

diff --git a/runtime/src/globals/console/mod.rs b/runtime/src/globals/console/mod.rs
@@ -465,5 +465,5 @@ const METHODS: &[JSFunctionSpec] = &[
 pub fn define(cx: &Context, global: &Object) -> bool {
 	let console = Object::new(cx);
 	(unsafe { console.define_methods(cx, METHODS) })
-		&& global.define_as(cx, "console", &console, PropertyFlags::CONSTANT_ENUMERATED)
+		&& global.define_as(cx, "console", &console, PropertyFlags::ENUMERATE)
 }
diff --git a/runtime/src/globals/microtasks.rs b/runtime/src/globals/microtasks.rs
@@ -30,6 +30,6 @@ pub fn define(cx: &Context, global: &Object) -> bool {
 		cx,
 		"queueMicrotask",
 		&Function::from_spec(cx, &FUNCTION),
-		PropertyFlags::CONSTANT_ENUMERATED,
+		PropertyFlags::ENUMERATE,
 	)
 }
diff --git a/runtime/src/module/standard.rs b/runtime/src/module/standard.rs
@@ -64,7 +64,7 @@ pub fn init_global_module<M: NativeModule>(cx: &Context, global: &Object) -> boo
 	let module = M::module(cx);
 
 	if let Some(module) = module {
-		global.define_as(cx, M::NAME, &module, PropertyFlags::CONSTANT_ENUMERATED)
+		global.define_as(cx, M::NAME, &module, PropertyFlags::ENUMERATE)
 	} else {
 		false
 	}