Concretize the definition of Primitive type

runtime/sema/any_type.go

@@ -28,6 +28,7 @@ var AnyType = &SimpleType{
 	IsResource:    false,
 	// `Any` is never a valid type in user programs
 	Storable:   true,
+	Primitive:  false,
 	Equatable:  false,
 	Comparable: false,
 	// `Any` is never a valid type in user programs

runtime/sema/anyattachment_types.go

@@ -27,6 +27,7 @@ var AnyResourceAttachmentType = &SimpleType{
 	TypeID:        AnyResourceAttachmentTypeName,
 	TypeTag:       AnyResourceAttachmentTypeTag,
 	IsResource:    true,
+	Primitive:     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,
+	Primitive:     false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,

runtime/sema/anyresource_type.go

@@ -25,6 +25,7 @@ var AnyResourceType = &SimpleType{
 	TypeID:        "AnyResource",
 	TypeTag:       AnyResourceTypeTag,
 	IsResource:    true,
+	Primitive:     false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
 	Equatable:  false,

runtime/sema/anystruct_type.go

@@ -27,6 +27,7 @@ var AnyStructType = &SimpleType{
 	IsResource:    false,
 	// The actual storability of a value is checked at run-time
 	Storable:   true,
+	Primitive:  false,
 	Equatable:  false,
 	Comparable: false,
 	Exportable: true,

runtime/sema/bool_type.go

@@ -26,6 +26,7 @@ var BoolType = &SimpleType{
 	TypeTag:       BoolTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    true,
 	Exportable:    true,

runtime/sema/character.cdc

@@ -1,6 +1,6 @@
 
 access(all)
-struct Character: Storable, Equatable, Comparable, Exportable, Importable {
+struct Character: Storable, Primitive, Equatable, Comparable, Exportable, Importable {
 
     /// The byte array of the UTF-8 encoding.
     access(all)

runtime/sema/gen/main.go

@@ -155,6 +155,7 @@
 	fullTypeName       string
 	compositeKind      common.CompositeKind
 	storable           bool
+	primitive          bool
 	equatable          bool
 	exportable         bool
 	comparable         bool
@@ -524,6 +525,15 @@
 			}
 			typeDecl.storable = true
 
+		case "Primitive":
+			if !generateSimpleType {
+				panic(fmt.Errorf(
+					"composite types cannot be explicitly marked as primitive: %s",
+					g.currentTypeID(),
+				))
+			}
+			typeDecl.primitive = true
+
 		case "Equatable":
 			if !generateSimpleType {
 				panic(fmt.Errorf(
@@ -1576,6 +1586,7 @@
 	//	tag:           TestTypeTag,
 	//	IsResource:    true,
 	//	Storable:      false,
+	//	Primitive:     false,
 	//	Equatable:     false,
 	//	Comparable:    false,
 	//	Exportable:    false,
@@ -1590,6 +1601,7 @@
 		goKeyValue("TypeTag", typeTagVarIdent(ty.fullTypeName)),
 		goKeyValue("IsResource", goBoolLit(isResource)),
 		goKeyValue("Storable", goBoolLit(ty.storable)),
+		goKeyValue("Primitive", goBoolLit(ty.primitive)),
 		goKeyValue("Equatable", goBoolLit(ty.equatable)),
 		goKeyValue("Comparable", goBoolLit(ty.comparable)),
 		goKeyValue("Exportable", goBoolLit(ty.exportable)),

runtime/sema/gen/testdata/primitive/helper.go

@@ -0,0 +1,23 @@
+/*
+ * Cadence - The resource-oriented smart contract programming language
+ *
+ * Copyright Dapper Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package primitive
+
+import "github.com/onflow/cadence/runtime/sema"
+
+var TestTypeTag sema.TypeTag

runtime/sema/gen/testdata/primitive/test.cdc

@@ -0,0 +1 @@
+access(all) struct Test: Primitive {}

runtime/sema/invalid_type.go

@@ -28,6 +28,7 @@ var InvalidType = &SimpleType{
 	TypeTag:       InvalidTypeTag,
 	IsResource:    false,
 	Storable:      false,
+	Primitive:     false,
 	Equatable:     false,
 	Comparable:    false,
 	Exportable:    false,

runtime/sema/meta_type.go

@@ -40,6 +40,7 @@ var MetaType = &SimpleType{
 	TypeTag:       MetaTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     false,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,

runtime/sema/never_type.go

@@ -26,6 +26,7 @@ var NeverType = &SimpleType{
 	TypeTag:       NeverTypeTag,
 	IsResource:    false,
 	Storable:      false,
+	Primitive:     false,
 	Equatable:     false,
 	Comparable:    false,
 	Exportable:    false,

runtime/sema/path_type.go

@@ -26,6 +26,7 @@ var PathType = &SimpleType{
 	TypeTag:       PathTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,
@@ -42,6 +43,7 @@ var StoragePathType = &SimpleType{
 	TypeTag:       StoragePathTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,
@@ -58,6 +60,7 @@ var CapabilityPathType = &SimpleType{
 	TypeTag:       CapabilityPathTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,
@@ -74,6 +77,7 @@ var PublicPathType = &SimpleType{
 	TypeTag:       PublicPathTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,
@@ -90,6 +94,7 @@ var PrivatePathType = &SimpleType{
 	TypeTag:       PrivatePathTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    false,
 	Exportable:    true,

runtime/sema/simple_type.go

@@ -48,6 +48,7 @@
 	Equatable           bool
 	Comparable          bool
 	Storable            bool
+	Primitive           bool
 	IsResource          bool
 	ContainFields       bool
 }
@@ -82,6 +83,10 @@
 	return t.IsResource
 }
 
+func (t *SimpleType) IsPrimitiveType() bool {
+	return t.Primitive
+}
+
 func (t *SimpleType) IsInvalidType() bool {
 	return t == InvalidType
 }

runtime/sema/storable_type.go

@@ -35,6 +35,7 @@ var StorableType = &SimpleType{
 	// for e.g. parameters, return types, fields, etc.
 	IsResource: false,
 	Storable:   true,
+	Primitive:  false,
 	Equatable:  false,
 	Comparable: false,
 	Exportable: false,

runtime/sema/string_type.go

@@ -55,6 +55,7 @@ var StringType = &SimpleType{
 	TypeTag:       StringTypeTag,
 	IsResource:    false,
 	Storable:      true,
+	Primitive:     true,
 	Equatable:     true,
 	Comparable:    true,
 	Exportable:    true,