Factor out extractTypeObject

Author: owen-mc

go/extractor/extractor.go

@@ -1607,15 +1607,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			extractUnderlyingType(tw, lbl, underlying)
 			trackInstantiatedStructFields(tw, tp, origintp)
 
-			entitylbl, exists := tw.Labeler.LookupObjectID(origintp.Obj(), lbl)
-			if entitylbl == trap.InvalidLabel {
-				log.Printf("Omitting type-object binding for unknown object %v.\n", origintp.Obj())
-			} else {
-				if !exists {
-					extractObject(tw, origintp.Obj(), entitylbl)
-				}
-				dbscheme.TypeObjectTable.Emit(tw, lbl, entitylbl)
-			}
+			extractTypeObject(tw, lbl, origintp.Obj())
 
 			// ensure all methods have labels - note that methods do not have a
 			// parent scope, so they are not dealt with by `extractScopes`
@@ -1652,15 +1644,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
 			dbscheme.TypeNameTable.Emit(tw, lbl, tp.Obj().Name())
 			dbscheme.AliasRhsTable.Emit(tw, lbl, extractType(tw, tp.Rhs()))
 
-			entitylbl, exists := tw.Labeler.LookupObjectID(tp.Obj(), lbl)
-			if entitylbl == trap.InvalidLabel {
-				log.Printf("Omitting type-object binding for unknown object %v.\n", tp.Obj())
-			} else {
-				if !exists {
-					extractObject(tw, tp.Obj(), entitylbl)
-				}
-				dbscheme.TypeObjectTable.Emit(tw, lbl, entitylbl)
-			}
+			extractTypeObject(tw, lbl, tp.Obj())
 		default:
 			log.Fatalf("unexpected type %T", tp)
 		}
@@ -1820,6 +1804,19 @@ func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
 	return lbl, exists
 }
 
+// extractTypeObject extracts a single type object and emits it to the type object table.
+func extractTypeObject(tw *trap.Writer, lbl trap.Label, entity *types.TypeName) {
+	entitylbl, exists := tw.Labeler.LookupObjectID(entity, lbl)
+	if entitylbl == trap.InvalidLabel {
+		log.Printf("Omitting type-object binding for unknown object %v.\n", entity)
+	} else {
+		if !exists {
+			extractObject(tw, entity, entitylbl)
+		}
+		dbscheme.TypeObjectTable.Emit(tw, lbl, entitylbl)
+	}
+}
+
 // extractKeyType extracts `key` as the key type of the map type `mp`
 func extractKeyType(tw *trap.Writer, mp trap.Label, key types.Type) {
 	dbscheme.KeyTypeTable.Emit(tw, mp, extractType(tw, key))