Define PrimitiveType

onflow · Dec 4, 2023 · 9336753 · 9336753
1 parent 787812f
commit 9336753
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 6 deletions.
diff --git a/runtime/sema/account_capability_controller.gen.go b/runtime/sema/account_capability_controller.gen.go
diff --git a/runtime/sema/any_type.go b/runtime/sema/any_type.go
@@ -26,6 +26,7 @@ var AnyType = &SimpleType{
 	TypeID:        "Any",
 	TypeTag:       AnyTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	// `Any` is never a valid type in user programs
 	Storable:   true,
 	Equatable:  false,

diff --git a/runtime/sema/anyattachment_types.go b/runtime/sema/anyattachment_types.go
@@ -27,6 +27,7 @@ var AnyResourceAttachmentType = &SimpleType{
 	TypeID:        AnyResourceAttachmentTypeName,
 	TypeTag:       AnyResourceAttachmentTypeTag,
 	IsResource:    true,
+	IsPrimitive:   false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,
@@ -45,6 +46,7 @@ var AnyStructAttachmentType = &SimpleType{
 	TypeID:        AnyStructAttachmentTypeName,
 	TypeTag:       AnyStructAttachmentTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,

diff --git a/runtime/sema/anyresource_type.go b/runtime/sema/anyresource_type.go
@@ -25,6 +25,7 @@ var AnyResourceType = &SimpleType{
 	TypeID:        "AnyResource",
 	TypeTag:       AnyResourceTypeTag,
 	IsResource:    true,
+	IsPrimitive:   false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,

diff --git a/runtime/sema/anystruct_type.go b/runtime/sema/anystruct_type.go
@@ -25,6 +25,7 @@ var AnyStructType = &SimpleType{
 	TypeID:        "AnyStruct",
 	TypeTag:       AnyStructTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,

diff --git a/runtime/sema/block.gen.go b/runtime/sema/block.gen.go
diff --git a/runtime/sema/bool_type.go b/runtime/sema/bool_type.go
@@ -25,6 +25,7 @@ var BoolType = &SimpleType{
 	TypeID:        "Bool",
 	TypeTag:       BoolTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    true,

diff --git a/runtime/sema/character.gen.go b/runtime/sema/character.gen.go
diff --git a/runtime/sema/deployedcontract.gen.go b/runtime/sema/deployedcontract.gen.go
diff --git a/runtime/sema/gen/main.go b/runtime/sema/gen/main.go
@@ -1575,6 +1575,7 @@ func simpleTypeLiteral(ty *typeDecl) dst.Expr {
 	//	TypeID:        TestTypeName,
 	//	tag:           TestTypeTag,
 	//	IsResource:    true,
+	//	IsPrimitive:   false,
 	//	Storable:      false,
 	//	Equatable:     false,
 	//	Comparable:    false,
@@ -1583,12 +1584,14 @@ func simpleTypeLiteral(ty *typeDecl) dst.Expr {
 	//}
 
 	isResource := ty.compositeKind == common.CompositeKindResource
+	_, isPrimitive := sema.GeneratedPrimitiveSimpleTypes[ty.typeName]
 	elements := []dst.Expr{
 		goKeyValue("Name", typeNameVarIdent(ty.fullTypeName)),
 		goKeyValue("QualifiedName", typeNameVarIdent(ty.fullTypeName)),
 		goKeyValue("TypeID", typeNameVarIdent(ty.fullTypeName)),
 		goKeyValue("TypeTag", typeTagVarIdent(ty.fullTypeName)),
 		goKeyValue("IsResource", goBoolLit(isResource)),
+		goKeyValue("IsPrimitive", goBoolLit(isPrimitive)),
 		goKeyValue("Storable", goBoolLit(ty.storable)),
 		goKeyValue("Equatable", goBoolLit(ty.equatable)),
 		goKeyValue("Comparable", goBoolLit(ty.comparable)),

diff --git a/runtime/sema/gen/testdata/comparable/test.golden.go b/runtime/sema/gen/testdata/comparable/test.golden.go
diff --git a/runtime/sema/gen/testdata/docstrings/test.golden.go b/runtime/sema/gen/testdata/docstrings/test.golden.go
diff --git a/runtime/sema/gen/testdata/equatable/test.golden.go b/runtime/sema/gen/testdata/equatable/test.golden.go
diff --git a/runtime/sema/gen/testdata/exportable/test.golden.go b/runtime/sema/gen/testdata/exportable/test.golden.go
diff --git a/runtime/sema/gen/testdata/fields/test.golden.go b/runtime/sema/gen/testdata/fields/test.golden.go
diff --git a/runtime/sema/gen/testdata/functions/test.golden.go b/runtime/sema/gen/testdata/functions/test.golden.go
diff --git a/runtime/sema/gen/testdata/importable/test.golden.go b/runtime/sema/gen/testdata/importable/test.golden.go
diff --git a/runtime/sema/gen/testdata/member_accessible/test.golden.go b/runtime/sema/gen/testdata/member_accessible/test.golden.go
diff --git a/runtime/sema/gen/testdata/simple_resource/test.golden.go b/runtime/sema/gen/testdata/simple_resource/test.golden.go
diff --git a/runtime/sema/gen/testdata/simple_struct/test.golden.go b/runtime/sema/gen/testdata/simple_struct/test.golden.go
diff --git a/runtime/sema/gen/testdata/storable/test.golden.go b/runtime/sema/gen/testdata/storable/test.golden.go
diff --git a/runtime/sema/invalid_type.go b/runtime/sema/invalid_type.go
@@ -27,6 +27,7 @@ var InvalidType = &SimpleType{
 	TypeID:        "<<invalid>>",
 	TypeTag:       InvalidTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	Storable:      false,
 	Equatable:     false,
 	Comparable:    false,

diff --git a/runtime/sema/meta_type.go b/runtime/sema/meta_type.go
@@ -39,6 +39,7 @@ var MetaType = &SimpleType{
 	TypeID:        MetaTypeName,
 	TypeTag:       MetaTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,

diff --git a/runtime/sema/never_type.go b/runtime/sema/never_type.go
@@ -25,6 +25,7 @@ var NeverType = &SimpleType{
 	TypeID:        "Never",
 	TypeTag:       NeverTypeTag,
 	IsResource:    false,
+	IsPrimitive:   false,
 	Storable:      false,
 	Equatable:     false,
 	Comparable:    false,

diff --git a/runtime/sema/path_type.go b/runtime/sema/path_type.go
@@ -25,6 +25,7 @@ var PathType = &SimpleType{
 	TypeID:        "Path",
 	TypeTag:       PathTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,
@@ -45,6 +46,7 @@ var StoragePathType = &SimpleType{
 	TypeID:        "StoragePath",
 	TypeTag:       StoragePathTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,
@@ -61,6 +63,7 @@ var CapabilityPathType = &SimpleType{
 	TypeID:        "CapabilityPath",
 	TypeTag:       CapabilityPathTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,
@@ -81,6 +84,7 @@ var PublicPathType = &SimpleType{
 	TypeID:        "PublicPath",
 	TypeTag:       PublicPathTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,
@@ -97,6 +101,7 @@ var PrivatePathType = &SimpleType{
 	TypeID:        "PrivatePath",
 	TypeTag:       PrivatePathTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    false,

diff --git a/runtime/sema/simple_type.go b/runtime/sema/simple_type.go
@@ -25,6 +25,10 @@ import (
 	"github.com/onflow/cadence/runtime/common"
 )
 
+var GeneratedPrimitiveSimpleTypes = map[string]bool{
+	CharacterTypeName: true,
+}
+
 type ValueIndexingInfo struct {
 	ElementType                   func(_ bool) Type
 	IndexingType                  *NumericType
@@ -50,6 +54,7 @@ type SimpleType struct {
 	Comparable          bool
 	Storable            bool
 	IsResource          bool
+	IsPrimitive         bool
 	ContainFields       bool
 }
 
@@ -83,6 +88,10 @@ func (t *SimpleType) IsResourceType() bool {
 	return t.IsResource
 }
 
+func (t *SimpleType) IsPrimitiveType() bool {
+	return t.IsPrimitive
+}
+
 func (t *SimpleType) IsInvalidType() bool {
 	return t == InvalidType
 }

diff --git a/runtime/sema/storable_type.go b/runtime/sema/storable_type.go
@@ -33,12 +33,13 @@ var StorableType = &SimpleType{
 	// only used as e.g. a type bound, but is not accessible
 	// to user programs, i.e. can't be used in type annotations
 	// for e.g. parameters, return types, fields, etc.
-	IsResource: false,
-	Storable:   true,
-	Equatable:  false,
-	Comparable: false,
-	Exportable: false,
-	Importable: false,
+	IsResource:  false,
+	IsPrimitive: false,
+	Storable:    true,
+	Equatable:   false,
+	Comparable:  false,
+	Exportable:  false,
+	Importable:  false,
 	IsSuperTypeOf: func(subType Type) bool {
 		storableResults := map[*Member]bool{}
 		return subType.IsStorable(storableResults)

diff --git a/runtime/sema/storage_capability_controller.gen.go b/runtime/sema/storage_capability_controller.gen.go
diff --git a/runtime/sema/string_type.go b/runtime/sema/string_type.go
@@ -54,6 +54,7 @@ var StringType = &SimpleType{
 	TypeID:        "String",
 	TypeTag:       StringTypeTag,
 	IsResource:    false,
+	IsPrimitive:   true,
 	Storable:      true,
 	Equatable:     true,
 	Comparable:    true,