Skip to content

Commit

Permalink
Merge branch 'lune-org:main' into ffi
Browse files Browse the repository at this point in the history
  • Loading branch information
qwreey authored Nov 8, 2024
2 parents 3a6f3bd + 5d1401c commit 4588581
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 27 deletions.
12 changes: 6 additions & 6 deletions crates/lune-roblox/src/instance/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ pub fn add_methods<'lua, M: LuaUserDataMethods<'lua, Instance>>(m: &mut M) {
},
);
m.add_method("IsA", |_, this, class_name: String| {
ensure_not_destroyed(this)?;
Ok(class_is_a(&this.class_name, class_name).unwrap_or(false))
});
m.add_method(
Expand Down Expand Up @@ -217,19 +216,20 @@ fn instance_property_get<'lua>(
this: &Instance,
prop_name: String,
) -> LuaResult<LuaValue<'lua>> {
ensure_not_destroyed(this)?;

match prop_name.as_str() {
"ClassName" => return this.get_class_name().into_lua(lua),
"Name" => {
return this.get_name().into_lua(lua);
}
"Parent" => {
return this.get_parent().into_lua(lua);
}
_ => {}
}

ensure_not_destroyed(this)?;

if prop_name.as_str() == "Name" {
return this.get_name().into_lua(lua);
}

if let Some(info) = find_property_info(&this.class_name, &prop_name) {
if let Some(prop) = this.get_property(&prop_name) {
if let DomValue::Enum(enum_value) = prop {
Expand Down
5 changes: 1 addition & 4 deletions crates/lune-roblox/src/instance/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,7 @@ impl Instance {
pub fn get_parent(&self) -> Option<Instance> {
let dom = INTERNAL_DOM.lock().expect("Failed to lock document");

let parent_ref = dom
.get_by_ref(self.dom_ref)
.expect("Failed to find instance in document")
.parent();
let parent_ref = dom.get_by_ref(self.dom_ref)?.parent();

if parent_ref == dom.root_ref() {
None
Expand Down
6 changes: 6 additions & 0 deletions crates/lune-std-process/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ pub fn module(lua: &Lua) -> LuaResult<LuaTable> {
// Create constants for OS & processor architecture
let os = lua.create_string(OS.to_lowercase())?;
let arch = lua.create_string(ARCH.to_lowercase())?;
let endianness = lua.create_string(if cfg!(target_endian = "big") {
"big"
} else {
"little"
})?;
// Create readonly args array
let args_vec = lua
.app_data_ref::<Vec<String>>()
Expand All @@ -75,6 +80,7 @@ pub fn module(lua: &Lua) -> LuaResult<LuaTable> {
TableBuilder::new(lua)?
.with_value("os", os)?
.with_value("arch", arch)?
.with_value("endianness", endianness)?
.with_value("args", args_tab)?
.with_value("cwd", cwd_str)?
.with_value("env", env_tab)?
Expand Down
8 changes: 2 additions & 6 deletions tests/roblox/instance/methods/ClearAllChildren.luau
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@ assert(not pcall(function()
return child1.Name
end))

assert(not pcall(function()
return child1.Parent
end))
assert(not child1.Parent)

assert(not pcall(function()
return child2.Name
end))

assert(not pcall(function()
return child2.Parent
end))
assert(not child2.Parent)
12 changes: 3 additions & 9 deletions tests/roblox/instance/methods/Destroy.luau
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,16 @@ assert(not pcall(function()
return root.Name
end))

assert(not pcall(function()
return root.Parent
end))
assert(not root.Parent)

assert(not pcall(function()
return child.Name
end))

assert(not pcall(function()
return child.Parent
end))
assert(not child.Parent)

assert(not pcall(function()
return descendant.Name
end))

assert(not pcall(function()
return descendant.Parent
end))
assert(not descendant.Parent)
19 changes: 17 additions & 2 deletions types/process.luau
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export type OS = "linux" | "macos" | "windows"
export type Arch = "x86_64" | "aarch64"
export type Endianness = "big" | "little"

export type SpawnOptionsStdioKind = "default" | "inherit" | "forward" | "none"
export type SpawnOptionsStdio = {
Expand Down Expand Up @@ -117,8 +118,8 @@ export type ChildProcess = {
stdin: typeof(ChildProcessWriter),
stdout: typeof(ChildProcessReader),
stderr: typeof(ChildProcessReader),
kill: () -> ();
status: () -> { ok: boolean, code: number }
kill: () -> (),
status: () -> { ok: boolean, code: number },
}

--[=[
Expand Down Expand Up @@ -222,6 +223,20 @@ process.os = (nil :: any) :: OS
]=]
process.arch = (nil :: any) :: Arch

--[=[
@within Process
@prop endianness Endianness
@tag read_only
The endianness of the processor currently being used.
Possible values:
* `"big"`
* `"little"`
]=]
process.endianness = (nil :: any) :: Endianness

--[=[
@within Process
@prop args { string }
Expand Down

0 comments on commit 4588581

Please sign in to comment.