Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/glua.gleam
Original file line number Diff line number Diff line change
Expand Up @@ -1201,15 +1201,15 @@ pub fn call_function_by_name(
/// })
/// // -> Ok("fixed value")
/// ```
pub fn index(table ref: Value, key key: String) -> Action(Value, e) {
pub fn index(table ref: Value, key key: Value) -> Action(Value, e) {
Action(do_index(_, ref, key))
}

@external(erlang, "glua_ffi", "get_table_key")
fn do_index(
state: Lua,
ref: Value,
key: String,
key: Value,
) -> Result(#(Lua, Value), Error(e))

/// Sets `value` under `key` of the provided table.
Expand Down Expand Up @@ -1237,7 +1237,7 @@ fn do_index(
/// ```
pub fn new_index(
table ref: Value,
key key: String,
key key: Value,
value val: Value,
) -> Action(Nil, e) {
Action(do_new_index(_, ref, key, val))
Expand All @@ -1247,6 +1247,6 @@ pub fn new_index(
fn do_new_index(
state: Lua,
ref: Value,
key: String,
key: Value,
val: Value,
) -> Result(#(Lua, Nil), Error(e))
51 changes: 38 additions & 13 deletions test/glua_test.gleam
Original file line number Diff line number Diff line change
Expand Up @@ -925,20 +925,28 @@ pub fn decode_function_test() {
pub fn index_test() {
let assert Ok(#(state, tbl)) =
glua.exec(glua.new(), {
glua.table([#(glua.string("a_key"), glua.string("a value"))])
glua.table([
#(glua.string("a_key"), glua.string("a value")),
#(glua.int(4), glua.string("another value")),
])
})

assert glua.run(
state,
glua.index(tbl, "a_key") |> glua.returning(decode.string),
glua.index(tbl, glua.string("a_key")) |> glua.returning(decode.string),
)
== Ok("a value")
assert glua.run(
state,
glua.index(tbl, glua.int(4)) |> glua.returning(decode.string),
)
== Ok("another value")

assert glua.run(state, {
use tbl <- glua.then(
glua.table([#(glua.string("a_key"), glua.string("a value"))]),
)
glua.index(tbl, "other_key")
glua.index(tbl, glua.string("other_key"))
})
== Error(glua.KeyNotFound(["other_key"]))

Expand Down Expand Up @@ -971,13 +979,22 @@ pub fn index_test() {
glua.success(tbl)
})

assert glua.run(state, glua.index(tbl, "1") |> glua.returning(decode.string))
assert glua.run(
state,
glua.index(tbl, glua.string("1")) |> glua.returning(decode.string),
)
== Ok("integer")

assert glua.run(state, glua.index(tbl, "a") |> glua.returning(decode.string))
assert glua.run(
state,
glua.index(tbl, glua.string("a")) |> glua.returning(decode.string),
)
== Ok("other")

assert glua.run(state, glua.index(tbl, "2") |> glua.returning(decode.int))
assert glua.run(
state,
glua.index(tbl, glua.string("2")) |> glua.returning(decode.int),
)
== Error(
glua.UnexpectedResultType([decode.DecodeError("Int", "String", [])]),
)
Expand All @@ -987,8 +1004,8 @@ pub fn new_index_test() {
let assert Ok(#(state, tbl)) = glua.exec(glua.new(), { glua.table([]) })

assert glua.run(state, {
use _ <- glua.then(glua.new_index(tbl, "a_key", glua.int(1)))
glua.index(tbl, "a_key") |> glua.returning(decode.int)
use _ <- glua.then(glua.new_index(tbl, glua.string("a_key"), glua.int(1)))
glua.index(tbl, glua.string("a_key")) |> glua.returning(decode.int)
})
== Ok(1)

Expand Down Expand Up @@ -1018,14 +1035,18 @@ pub fn new_index_test() {
})

assert glua.run(state, {
use _ <- glua.then(glua.new_index(tbl, "a_key", glua.int(6)))
glua.index(tbl, "a_key") |> glua.returning(decode.int)
use _ <- glua.then(glua.new_index(tbl, glua.string("a_key"), glua.int(6)))
glua.index(tbl, glua.string("a_key")) |> glua.returning(decode.int)
})
== Ok(36)

assert glua.run(state, {
use _ <- glua.then(glua.new_index(tbl, "other_key", glua.int(7)))
glua.index(tbl, "other_key") |> glua.returning(decode.int)
use _ <- glua.then(glua.new_index(
tbl,
glua.string("other_key"),
glua.int(7),
))
glua.index(tbl, glua.string("other_key")) |> glua.returning(decode.int)
})
== Ok(49)

Expand All @@ -1050,5 +1071,9 @@ pub fn new_index_test() {
let assert Error(glua.LuaRuntimeException(
exception: glua.ErrorCall(message: "read-only table", level: _),
state: _,
)) = glua.run(state, glua.new_index(tbl, "my_key", glua.string("my value")))
)) =
glua.run(
state,
glua.new_index(tbl, glua.string("my_key"), glua.string("my value")),
)
}
Loading