working on reflectlite and abi

Author: grantnelson-wf

compiler/natives/src/internal/reflectlite/reflectlite.go

@@ -39,10 +39,14 @@ var (
 	idRtype       = "_rtype"
 )
 
-func jsType(typ Type) *js.Object {
+func jsType(typ *abi.Type) *js.Object {
 	return js.InternalObject(typ).Get(idJsType)
 }
 
+func jsPtrTo(typ *abi.Type) *js.Object {
+	return jsType(PtrTo(toRType(typ)).(*rtype).Type)
+}
+
 func reflectType(typ *js.Object) *rtype {
 	if typ.Get(idReflectType) == js.Undefined {
 		rt := &rtype{
@@ -223,19 +227,19 @@ func internalStr(strObj *js.Object) string {
 	return c.str
 }
 
-func isWrapped(typ Type) bool {
+func isWrapped(typ *abi.Type) bool {
 	return jsType(typ).Get("wrapped").Bool()
 }
 
-func copyStruct(dst, src *js.Object, typ Type) {
+func copyStruct(dst, src *js.Object, typ *abi.Type) {
 	fields := jsType(typ).Get("fields")
 	for i := 0; i < fields.Length(); i++ {
 		prop := fields.Index(i).Get("prop").String()
 		dst.Set(prop, src.Get(prop))
 	}
 }
 
-func makeValue(t Type, v *js.Object, fl flag) Value {
+func makeValue(t *abi.Type, v *js.Object, fl flag) Value {
 	rt := t.common()
 	switch t.Kind() {
 	case abi.Array, abi.Struct, abi.Pointer:
@@ -422,7 +426,7 @@ func mapaccess(t *rtype, m, key unsafe.Pointer) unsafe.Pointer {
 	if entry == js.Undefined {
 		return nil
 	}
-	return unsafe.Pointer(js.Global.Call("$newDataPointer", entry.Get("v"), jsType(PtrTo(t.Elem()))).Unsafe())
+	return unsafe.Pointer(js.Global.Call("$newDataPointer", entry.Get("v"), jsPtrTo(t.Elem())).Unsafe())
 }
 
 func mapassign(t *rtype, m, key, val unsafe.Pointer) {
@@ -493,7 +497,7 @@ func mapiterkey(it unsafe.Pointer) unsafe.Pointer {
 		// Record the key-value pair for later accesses.
 		iter.last = kv
 	}
-	return unsafe.Pointer(js.Global.Call("$newDataPointer", kv.Get("k"), jsType(PtrTo(iter.t.(TypeEx).Key()))).Unsafe())
+	return unsafe.Pointer(js.Global.Call("$newDataPointer", kv.Get("k"), jsPtrTo(iter.t.(TypeEx).Key())).Unsafe())
 }
 
 func mapiternext(it unsafe.Pointer) {
@@ -519,7 +523,7 @@ func cvtDirect(v Value, typ Type) Value {
 		slice.Set("$offset", srcVal.Get("$offset"))
 		slice.Set("$length", srcVal.Get("$length"))
 		slice.Set("$capacity", srcVal.Get("$capacity"))
-		val = js.Global.Call("$newDataPointer", slice, jsType(PtrTo(typ)))
+		val = js.Global.Call("$newDataPointer", slice, jsPtrTo(typ))
 	case abi.Pointer:
 		if typ.Elem().Kind() == abi.Struct {
 			if typ.Elem() == v.typ.Elem() {
@@ -635,7 +639,7 @@ func valueInterface(v Value) any {
 	return any(unsafe.Pointer(v.object().Unsafe()))
 }
 
-func ifaceE2I(t *rtype, src any, dst unsafe.Pointer) {
+func ifaceE2I(t *abi.Type, src any, dst unsafe.Pointer) {
 	js.InternalObject(dst).Call("$set", js.InternalObject(src))
 }
 

compiler/natives/src/internal/reflectlite/type.go

@@ -36,11 +36,11 @@ func newTypeOff(t *rtype) typeOff {
 
 func (t rtype) Comparable() bool {
 	switch t.Kind() {
-	case Func, Slice, Map:
+	case abi.Func, abi.Slice, abi.Map:
 		return false
-	case Array:
+	case abi.Array:
 		return t.Elem().Comparable()
-	case Struct:
+	case abi.Struct:
 		for i := 0; i < t.NumField(); i++ {
 			ft := t.Field(i)
 			if !ft.typ.Comparable() {
@@ -52,7 +52,7 @@ func (t rtype) Comparable() bool {
 }
 
 func (t *rtype) IsVariadic() bool {
-	if t.Kind() != Func {
+	if t.Kind() != abi.Func {
 		panic("reflect: IsVariadic of non-func type")
 	}
 	tt := (*funcType)(unsafe.Pointer(t))
@@ -64,23 +64,23 @@ func (t *rtype) kindType() *rtype {
 }
 
 func (t *rtype) Key() Type {
-	if t.Kind() != Map {
+	if t.Kind() != abi.Map {
 		panic("reflect: Key of non-map type")
 	}
 	tt := (*mapType)(unsafe.Pointer(t))
 	return toType(tt.key)
 }
 
 func (t *rtype) NumField() int {
-	if t.Kind() != Struct {
+	if t.Kind() != abi.Struct {
 		panic("reflect: NumField of non-struct type")
 	}
 	tt := (*structType)(unsafe.Pointer(t))
 	return len(tt.fields)
 }
 
 func (t *rtype) Method(i int) (m Method) {
-	if t.Kind() == Interface {
+	if t.Kind() == abi.Interface {
 		tt := (*interfaceType)(unsafe.Pointer(t))
 		return tt.Method(i)
 	}