added some array iteration code
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2025-11-05 22:42:05 +09:00
parent ac39ef2bc4
commit d917f812d7
4 changed files with 53 additions and 16 deletions

49
hawk.go
View File

@ -103,8 +103,15 @@ const (
VAL_BOB ValType = C.HAWK_VAL_BOB
)
type BitMask C.hawk_bitmask_t
type ValArrayItr struct {
c C.hawk_val_arr_itr_t
}
type ValMapItr struct {
c *C.hawk_val_map_itr_t
}
type BitMask C.hawk_bitmask_t
func deregister_instance(h *Hawk) {
fmt.Printf ("DEREGISER INSTANCE %p\n", h)
@ -647,19 +654,27 @@ func (val *Val) ArrayField(index int) (*Val, error) {
return val.rtx.make_val(func() *C.hawk_val_t { return v })
}
/*
func (val *Val) ArrayFirstField() *Val {
var v *C.hawk_val_t
var itr C.hawk_val_arr_itr_t
v = C.hawk_rtx_getfirstarrvalitr(val.rtx.c, val.c, &itr)
if v == nil { return nil, val.rtx.make_errinfo() }
return val.rtx.make_val(func() *C.hawk_val_t { return v })
func (val *Val) ArrayFirstField(itr *ValArrayItr) *Val {
var i *C.hawk_val_arr_itr_t
var v *Val
var err error
i = C.hawk_rtx_getfirstarrvalitr(val.rtx.c, val.c, &itr.c)
if i == nil { return nil }
v, err = val.rtx.make_val(func() *C.hawk_val_t { return itr.c.elem })
if err != nil { return nil }
return v;
}
func (val *Val) ArrayNextField(itr ValArrItr) *Val {
func (val *Val) ArrayNextField(itr *ValArrayItr) *Val {
var i *C.hawk_val_arr_itr_t
var v *Val
var err error
i = C.hawk_rtx_getnextarrvalitr(val.rtx.c, val.c, &itr.c)
if i == nil { return nil }
v, err = val.rtx.make_val(func() *C.hawk_val_t { return itr.c.elem })
if err != nil { return nil }
return v;
}
*/
func (val *Val) MapField(key string) (*Val, error) {
var v *C.hawk_val_t
@ -678,6 +693,12 @@ func (val *Val) MapField(key string) (*Val, error) {
//func (val *Val) SetMapField(key string, val *Val) error {
//}
func (val *Val) String() string {
var s string
s, _ = val.ToStr()
return s
}
// -----------------------------------------------------------
var val_type []string = []string{
@ -702,6 +723,12 @@ func (t ValType) String() string {
// -----------------------------------------------------------
func (itr *ValArrayItr) Index() int {
return int(itr.c.itr.idx)
}
// -----------------------------------------------------------
func ucstr_to_rune_slice(str *C.hawk_uch_t) []rune {
return uchars_to_rune_slice(str, uintptr(C.hawk_count_ucstr(str)))
}