Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-08-01 20:12:19 +00:00
Code Issues Projects Releases Wiki Activity

accept-case haskey

Browse source
This commit is contained in:
John Kerl 2020-11-26 00:13:59 -05:00
parent 2c7aa97152
commit a1048e99c8
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
go/cases-to-do.txt
View file

@ -50,23 +50,6 @@ rrv ./reg-test/cases/case-c-dsl-haskey.sh
rrv ./reg-test/cases/case-c-dsl-extended-typeof.sh
rrv ./reg-test/cases/case-c-dsl-is-predicates.sh
* {1:2} is empty-map in Go; should step up (populate) or step down (error)
func (this *Mlrval) MapPut(key *Mlrval, value *Mlrval) {
if this.mvtype != MT_MAP {
// TODO: need to be careful about semantics here.
// Silent no-ops are not good UX ...
return
}
if key.mvtype != MT_STRING {
// TODO: need to be careful about semantics here.
// Silent no-ops are not good UX ...
return
}
this.mapval.PutCopy(&key.printrep, value)
}
================================================================
PARTIALLY IMPLEMENTED:
@ -185,3 +168,21 @@ rrv ./reg-test/cases/case-c-uniq.sh
rrv ./reg-test/cases/case-c-utf8-bom.sh
================================================================
rrv ./reg-test/cases/case-c-localvar-unsets.sh
rrv -C5 ./reg-test/cases/case-c-dsl-for-oosvar-loops.sh
rrv ./reg-test/cases/case-c-dsl-mapvar-assignments.sh
rrv ./reg-test/cases/case-c-dsl-split-join.sh
rrv -C5 ./reg-test/cases/case-c-dsl-asserting.sh
rrv -C1 ./reg-test/cases/case-c-dsl-length-depth-leafcount.sh
* int map keys
rrv -C1 ./reg-test/cases/case-c-dsl-mapvar-for-loops.sh
* int map keys
rrv ./reg-test/cases/case-c-dsl-haskey.sh
* haskey({3:4}, 3)
rrv ./reg-test/cases/case-c-dsl-extended-typeof.sh

9
go/src/miller/types/mlrval_functions_collections.go
View file

@ -154,13 +154,12 @@ func has_key_in_array(ma, mb *Mlrval) Mlrval {
}
func has_key_in_map(ma, mb *Mlrval) Mlrval {
if mb.mvtype == MT_INT {
return MlrvalFromFalse()
}
if mb.mvtype != MT_STRING {
if mb.mvtype == MT_STRING || mb.mvtype == MT_INT {
s := mb.String()
return MlrvalFromBool(ma.mapval.Has(&s))
} else {
return MlrvalFromError()
}
return MlrvalFromBool(ma.mapval.Has(&mb.printrep))
}
func MlrvalHasKey(ma, mb *Mlrval) Mlrval {