Skip to content

Replace retired value.get / json.keys with value.field / value.keys #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atzurody wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace retired value.get / json.keys with value.field / value.keys #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions spec/yaml_test.almd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import self as yaml
import json

fn unwrap(r: Result[Value, String]) -> Value = match r {
ok(v) => v,
err(e) => { println("ERROR: ${e}"); value.null() },
}

fn gs(v: Value, key: String) -> String =
value.as_string(value.get(v, key) ?? value.null()) ?? ""
value.as_string(value.field(v, key) ?? value.null()) ?? ""

fn gi(v: Value, key: String) -> Int =
value.as_int(value.get(v, key) ?? value.null()) ?? 0
value.as_int(value.field(v, key) ?? value.null()) ?? 0

fn gf(v: Value, key: String) -> Float =
value.as_float(value.get(v, key) ?? value.null()) ?? 0.0
value.as_float(value.field(v, key) ?? value.null()) ?? 0.0

fn gb(v: Value, key: String) -> Bool =
value.as_bool(value.get(v, key) ?? value.null()) ?? false
value.as_bool(value.field(v, key) ?? value.null()) ?? false

fn go(v: Value, key: String) -> Value =
value.get(v, key) ?? value.object([])
value.field(v, key) ?? value.object([])

fn ga(v: Value) -> List[Value] = value.as_array(v) ?? []

Expand Down Expand Up @@ -252,7 +251,7 @@ test "empty flow sequence" {
}

test "empty flow mapping" {
assert_eq(list.len(json.keys(go(unwrap(yaml.parse("meta: {}")), "meta"))), 0)
assert_eq(list.len(value.keys(go(unwrap(yaml.parse("meta: {}")), "meta"))), 0)
}

test "flow sequence of numbers" {
Expand Down Expand Up @@ -684,17 +683,17 @@ test "bool FALSE" {

test "empty value is null (explicit)" {
let v = unwrap(yaml.parse("empty:"))
assert_eq(value.stringify(value.get(v, "empty") ?? value.null()), "null")
assert_eq(value.stringify(value.field(v, "empty") ?? value.null()), "null")
}

test "tilde is null" {
let v = unwrap(yaml.parse("v: ~"))
assert_eq(value.stringify(value.get(v, "v") ?? value.null()), "null")
assert_eq(value.stringify(value.field(v, "v") ?? value.null()), "null")
}

test "english null" {
let v = unwrap(yaml.parse("v: null"))
assert_eq(value.stringify(value.get(v, "v") ?? value.null()), "null")
assert_eq(value.stringify(value.field(v, "v") ?? value.null()), "null")
}

// ═══════════════════════════════════════════════════════
Expand Down Expand Up @@ -992,7 +991,7 @@ test "roundtrip null value" {
let obj = value.object([("v", value.null())])
let text = yaml.stringify(obj)
let v = unwrap(yaml.parse(text))
assert_eq(value.stringify(value.get(v, "v") ?? value.null()), "null")
assert_eq(value.stringify(value.field(v, "v") ?? value.null()), "null")
}

test "roundtrip integer" {
Expand Down
5 changes: 2 additions & 3 deletions src/mod.almd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import json

effect fn parse(text: String) -> Value = {
let lines = string.replace(text, "\r\n", "\n")
Expand Down Expand Up @@ -248,7 +247,7 @@ local fn emit_non_int(v: Value, ind: Int) -> String =
match value.as_bool(v) { ok(b) => if b then "true" else "false", err(_) =>
match value.as_array(v) { ok(items) => emit_seq(items, ind), err(_) => emit_obj(v, ind) }}}
local fn emit_obj(v: Value, ind: Int) -> String = {
let keys = json.keys(v)
let keys = value.keys(v)
if list.is_empty(keys) then (if value.stringify(v) == "null" then "null" else "{}")
else emit_map(v, keys, ind)
}
Expand All @@ -273,7 +272,7 @@ local fn emit_seq(items: List[Value], ind: Int) -> String = {
local fn emit_map(v: Value, keys: List[String], ind: Int) -> String = {
let p = string.repeat(" ", ind)
keys |> list.map((key) => {
let val = value.get(v, key) ?? value.null()
let val = value.field(v, key) ?? value.null()
let ks = emit_scalar(key)
if is_compound(val) then "${p}${ks}:\n${emit(val, ind + 1)}" else "${p}${ks}: ${emit(val, ind + 1)}"
}) |> list.join("\n")
Expand Down