Skip to content

Commit f7d79cf

Browse files
committed
Rename "named" to "defined" in dbscheme
1 parent 64c3f70 commit f7d79cf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

go/extractor/dbscheme/tables.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ var ChanTypes = map[gotypes.ChanDir]*BranchType{
856856
}
857857

858858
// DefinedType is the type of defined types
859-
var DefinedType = TypeKind.NewBranch("@namedtype", CompositeType)
859+
var DefinedType = TypeKind.NewBranch("@definedtype", CompositeType)
860860

861861
// TypeSetLiteral is the type of type set literals
862862
var TypeSetLiteral = TypeKind.NewBranch("@typesetliteraltype", CompositeType)
@@ -1138,7 +1138,7 @@ var BaseTypeTable = NewTable("base_type",
11381138
// UnderlyingTypeTable is the table associating defined types with their
11391139
// underlying type
11401140
var UnderlyingTypeTable = NewTable("underlying_type",
1141-
EntityColumn(DefinedType, "named").Unique(),
1141+
EntityColumn(DefinedType, "defined").Unique(),
11421142
EntityColumn(TypeType, "tp"),
11431143
)
11441144

go/ql/lib/go.dbscheme

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ methodreceivers(unique int method: @object ref, int receiver: @object ref);
184184

185185
fieldstructs(unique int field: @object ref, int struct: @structtype ref);
186186

187-
methodhosts(int method: @object ref, int host: @namedtype ref);
187+
methodhosts(int method: @object ref, int host: @definedtype ref);
188188

189189
defs(int ident: @ident ref, int object: @object ref);
190190

@@ -202,7 +202,7 @@ element_type(unique int container: @containertype ref, int tp: @type ref);
202202

203203
base_type(unique int ptr: @pointertype ref, int tp: @type ref);
204204

205-
underlying_type(unique int named: @namedtype ref, int tp: @type ref);
205+
underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
206206

207207
#keyset[parent, index]
208208
component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
@@ -506,7 +506,7 @@ case @type.kind of
506506
| 35 = @sendchantype
507507
| 36 = @recvchantype
508508
| 37 = @sendrcvchantype
509-
| 38 = @namedtype
509+
| 38 = @definedtype
510510
| 39 = @typesetliteraltype;
511511

512512
@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
@@ -531,7 +531,7 @@ case @type.kind of
531531
| @stringliteraltype | @nilliteraltype;
532532

533533
@compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
534-
| @signaturetype | @namedtype | @typesetliteraltype;
534+
| @signaturetype | @definedtype | @typesetliteraltype;
535535

536536
@containertype = @arraytype | @slicetype | @maptype | @chantype;
537537

go/ql/lib/semmle/go/Types.qll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ class SendRecvChanType extends @sendrcvchantype, ChanType {
10321032
deprecated class NamedType = DefinedType;
10331033

10341034
/** A defined type. */
1035-
class DefinedType extends @namedtype, CompositeType {
1035+
class DefinedType extends @definedtype, CompositeType {
10361036
/** Gets the type which this type is defined to be. */
10371037
Type getBaseType() { underlying_type(this, result) }
10381038

0 commit comments

Comments
 (0)