| Index: mojom/generators/c/templates/type_table.tmpl.go
|
| diff --git a/mojom/generators/c/templates/type_table.tmpl.go b/mojom/generators/c/templates/type_table.tmpl.go
|
| index c20d7e8edebda9a20ab5753eae67d93244eb3ff2..a8a18585e2478e79c663ad4ce50771ae233d5b95 100644
|
| --- a/mojom/generators/c/templates/type_table.tmpl.go
|
| +++ b/mojom/generators/c/templates/type_table.tmpl.go
|
| @@ -9,12 +9,14 @@ package templates
|
| // refer to them.
|
| const GenerateTypeTableDeclarations = `
|
| {{define "GenerateTypeTableDeclarations"}}
|
| +// Union type table declarations.
|
| {{range $union := .PublicUnionNames -}}
|
| -extern struct MojomPointerTableUnionEntry {{$union}}[];
|
| -{{end}}
|
| +extern struct MojomTypeTable {{$union}};
|
| +{{end -}}
|
|
|
| +// Struct type table declarations.
|
| {{range $struct := .PublicStructNames -}}
|
| -extern struct MojomPointerTableStructEntry {{$struct}}[];
|
| +extern struct MojomTypeTable {{$struct}};
|
| {{end -}}
|
| {{end}}
|
| `
|
| @@ -23,49 +25,56 @@ const GenerateTypeTableDefinitions = `
|
| {{define "GenerateTypeTableDefinitions"}}
|
| // Declarations for array type entries.
|
| {{range $array := .Arrays -}}
|
| -static struct MojomPointerTableArrayEntry {{$array.Name}};
|
| +static struct MojomTypeTableArrayEntry {{$array.Name}};
|
| {{end -}}
|
|
|
| // Declarations for struct type tables.
|
| {{range $struct := .Structs -}}
|
| -struct MojomPointerTableStructEntry {{$struct.Name}}[];
|
| +struct MojomTypeTable {{$struct.Name}};
|
| {{end -}}
|
|
|
| // Declarations for union type tables.
|
| {{range $union := .Unions -}}
|
| -struct MojomPointerTableUnionEntry {{$union.Name}}[];
|
| +struct MojomTypeTable {{$union.Name}};
|
| {{end -}}
|
|
|
| // Array type entry definitions.
|
| {{range $array := .Arrays -}}
|
| -static struct MojomPointerTableArrayEntry {{$array.Name}} = {
|
| - {{$array.ElemTable}}, {{$array.NumElements}},
|
| - {{$array.ElemType}}, {{$array.Nullable}},
|
| +static struct MojomTypeTableArrayEntry {{$array.Name}} = {
|
| + {{$array.ElemType}}, {{$array.ElemTable}},
|
| + {{$array.NumElements}}, {{$array.Nullable}},
|
| };
|
| {{end -}}
|
|
|
| // Struct type table definitions.
|
| {{range $struct := .Structs -}}
|
| -struct MojomPointerTableStructEntry {{$struct.Name}}[] = {
|
| +struct MojomTypeTableStructEntry {{$struct.Name}}_Entries[] = {
|
| {{- range $entry := $struct.Entries}}
|
| {
|
| - {{$entry.ElemTable}}, {{$entry.Offset}}, {{$entry.MinVersion}},
|
| - {{$entry.ElemType}}, {{$entry.Nullable}}, {{$entry.KeepGoing}},
|
| + {{$entry.ElemType}}, {{$entry.ElemTable}},
|
| + {{$entry.Offset}}, {{$entry.MinVersion}},
|
| + {{$entry.Nullable}},
|
| },
|
| {{end -}}
|
| };
|
| +struct MojomTypeTable {{$struct.Name}} = {
|
| + {{len $struct.Entries}}ul, {{$struct.Name}}_Entries,
|
| +};
|
| {{end -}}
|
|
|
| // Union type table definitions.
|
| {{range $union := .Unions -}}
|
| -struct MojomPointerTableUnionEntry {{$union.Name}}[] = {
|
| +struct MojomTypeTableUnionEntry {{$union.Name}}_Entries[] = {
|
| {{- range $entry := $union.Entries}}
|
| {
|
| - {{$entry.ElemTable}}, {{$entry.Tag}}, {{$entry.ElemType}},
|
| - {{$entry.Nullable}}, {{$entry.KeepGoing}},
|
| + {{$entry.ElemType}}, {{$entry.ElemTable}},
|
| + {{$entry.Tag}}, {{$entry.Nullable}},
|
| },
|
| {{end -}}
|
| };
|
| +struct MojomTypeTable {{$union.Name}} = {
|
| + {{len $union.Entries}}ul, {{$union.Name}}_Entries,
|
| +};
|
| {{end}}
|
|
|
| {{end}}
|
|
|