Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: mojom/mojom_tool/mojom/types.go

Issue 1916863003: Delete the |complete_type_set| field from mojom_types.mojom (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojom/mojom_tool/integration_tests/resolution_test.go ('k') | mojom/mojom_tool/mojom/user_defined_types.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojom/mojom_tool/mojom/types.go
diff --git a/mojom/mojom_tool/mojom/types.go b/mojom/mojom_tool/mojom/types.go
index 190a3d9d0a03839b1afa1127732b73f6c5aa482b..3796978eb17c56f567dac9a04b992d91b38b3bee 100644
--- a/mojom/mojom_tool/mojom/types.go
+++ b/mojom/mojom_tool/mojom/types.go
@@ -114,16 +114,6 @@ type TypeRef interface {
// Otherwise it will return the identifier.
TypeName() string
- // ReferencedUserDefinedTypes() is invoked after the resolution and validation
- // phases during the serialization phase. It returns the set of UserDefinedTypes
- // referenced by this TypeRef. For SimpleType, StringType and HandleTypeRef
- // this method returns the empty set. For UserTypeRef this method returns
- // a singleton containing the UserDefinedType that the reference resolves to.
- // For ArrayTypeRef this method returns the set of UserDefinedTypes of the element
- // type and for MapTypes this method returns the union of the set of UserDefined
- // types of the key type and the value type.
- ReferencedUserDefinedTypes() UserDefinedTypeSet
-
// Returns true just in case this type reference is allowed as the type of
// a struct field in a non-zero version of a struct. We disallow
// pointer and handle types that are not nullable. This means we allow all primitive
@@ -213,11 +203,6 @@ func (SimpleType) AllowedInNonZeroStructVersion() bool {
return true
}
-// A SimpleType does not reference any UserDefinedTypes.
-func (SimpleType) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- return MakeUserDefinedTypeSet()
-}
-
// From interface TypeRef:
// We allow users to assign integer literals to float or double variables as
@@ -482,11 +467,6 @@ func (s StringType) MarkTypeCompatible(assignment LiteralAssignment) (ok bool) {
return s.IsAssignmentCompatible(assignment.assignedValue)
}
-// A StringType does not reference any user defined types.
-func (StringType) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- return MakeUserDefinedTypeSet()
-}
-
func (s StringType) String() string {
nullableSpecifier := ""
if s.nullable {
@@ -565,11 +545,6 @@ func (HandleTypeRef) MarkTypeCompatible(assignment LiteralAssignment) bool {
return false
}
-// A HandleTypeRef does not reference any UserDefinedTypes.
-func (HandleTypeRef) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- return MakeUserDefinedTypeSet()
-}
-
func (h HandleTypeRef) String() string {
suffix := ""
switch h.kind {
@@ -713,14 +688,6 @@ func (ArrayTypeRef) MarkTypeCompatible(assignment LiteralAssignment) bool {
return false
}
-// An ArrayTypeRef references the UserDefinedTypes that are referenced
-// by its element type.
-func (a ArrayTypeRef) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- setOfTypes := MakeUserDefinedTypeSet()
- setOfTypes.AddAll(a.elementType.ReferencedUserDefinedTypes())
- return setOfTypes
-}
-
func (a ArrayTypeRef) ToString(debug bool) string {
fixedLengthSpecifier := ""
if a.fixedLength > 0 {
@@ -813,15 +780,6 @@ func (MapTypeRef) MarkTypeCompatible(assignment LiteralAssignment) bool {
return false
}
-// An MapTypeRef references the UserDefinedTypes that are referenced
-// by its key and valuye types.
-func (m MapTypeRef) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- setOfTypes := MakeUserDefinedTypeSet()
- setOfTypes.AddAll(m.keyType.ReferencedUserDefinedTypes())
- setOfTypes.AddAll(m.valueType.ReferencedUserDefinedTypes())
- return setOfTypes
-}
-
func (m MapTypeRef) ToString(debug bool) string {
nullableSpecifier := ""
if m.nullable {
@@ -971,16 +929,6 @@ func (ref *UserTypeRef) IsAssignmentCompatible(assignedValue ConcreteValue) bool
}
}
-// A UserTypeRef references a single UserDefinedType.
-func (ref *UserTypeRef) ReferencedUserDefinedTypes() UserDefinedTypeSet {
- if ref.resolvedType == nil {
- panic("This method should only be invoked after successful resolution.")
- }
- singleton := MakeUserDefinedTypeSet()
- singleton.Add(ref.resolvedType)
- return singleton
-}
-
func (t *UserTypeRef) MarkTypeCompatible(assignment LiteralAssignment) bool {
// Just mark the assignment attempt and return true. We will validate it
// during the validation phase.
« no previous file with comments | « mojom/mojom_tool/integration_tests/resolution_test.go ('k') | mojom/mojom_tool/mojom/user_defined_types.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698