mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-18 17:35:30 +00:00
Update internals to initializer instead of constructor.
This CL catches up the internals (along with a few error messages) to say `initializer` instead of `constructor. Bug: tint:1600 Change-Id: I8e56572c310d77da1130380bdd32b334f27c8e46 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/106462 Reviewed-by: Antonio Maiorano <amaiorano@google.com> Auto-Submit: Dan Sinclair <dsinclair@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
committed by
Dawn LUCI CQ
parent
56ce1a2155
commit
6e77b47ed9
@@ -71,8 +71,8 @@ func (p *parser) parse() (*ast.AST, error) {
|
||||
case tok.Operator:
|
||||
out.Operators = append(out.Operators, p.operatorDecl(attributes))
|
||||
attributes = nil
|
||||
case tok.Constructor:
|
||||
out.Constructors = append(out.Constructors, p.constructorDecl(attributes))
|
||||
case tok.Initializer:
|
||||
out.Initializers = append(out.Initializers, p.initializerDecl(attributes))
|
||||
attributes = nil
|
||||
case tok.Converter:
|
||||
out.Converters = append(out.Converters, p.converterDecl(attributes))
|
||||
@@ -204,12 +204,12 @@ func (p *parser) operatorDecl(decos ast.Attributes) ast.IntrinsicDecl {
|
||||
return f
|
||||
}
|
||||
|
||||
func (p *parser) constructorDecl(decos ast.Attributes) ast.IntrinsicDecl {
|
||||
p.expect(tok.Constructor, "constructor declaration")
|
||||
func (p *parser) initializerDecl(decos ast.Attributes) ast.IntrinsicDecl {
|
||||
p.expect(tok.Initializer, "initializer declaration")
|
||||
name := p.next()
|
||||
f := ast.IntrinsicDecl{
|
||||
Source: name.Source,
|
||||
Kind: ast.Constructor,
|
||||
Kind: ast.Initializer,
|
||||
Attributes: decos,
|
||||
Name: string(name.Runes),
|
||||
}
|
||||
|
||||
@@ -440,20 +440,20 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F()",
|
||||
"init F()",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
Parameters: ast.Parameters{},
|
||||
}},
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"@attr ctor F()",
|
||||
"@attr init F()",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
Attributes: ast.Attributes{
|
||||
{Name: "attr", Values: []string{}},
|
||||
@@ -463,10 +463,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F(a)",
|
||||
"init F(a)",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
Parameters: ast.Parameters{
|
||||
{Type: ast.TemplatedName{Name: "a"}},
|
||||
@@ -475,10 +475,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F(a: T)",
|
||||
"init F(a: T)",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
Parameters: ast.Parameters{
|
||||
{Name: "a", Type: ast.TemplatedName{Name: "T"}},
|
||||
@@ -487,10 +487,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F(a, b)",
|
||||
"init F(a, b)",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
Parameters: ast.Parameters{
|
||||
{Type: ast.TemplatedName{Name: "a"}},
|
||||
@@ -500,10 +500,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F<A : B<C> >()",
|
||||
"init F<A : B<C> >()",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
TemplateParams: ast.TemplateParams{
|
||||
{
|
||||
@@ -520,10 +520,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F<T>(a: X, b: Y<T>)",
|
||||
"init F<T>(a: X, b: Y<T>)",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
TemplateParams: ast.TemplateParams{
|
||||
{Name: "T"},
|
||||
@@ -539,10 +539,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F() -> X",
|
||||
"init F() -> X",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
ReturnType: &ast.TemplatedName{Name: "X"},
|
||||
Parameters: ast.Parameters{},
|
||||
@@ -550,10 +550,10 @@ func TestParser(t *testing.T) {
|
||||
},
|
||||
}, { ///////////////////////////////////////////////////////////////////
|
||||
utils.ThisLine(),
|
||||
"ctor F() -> X<T>",
|
||||
"init F() -> X<T>",
|
||||
ast.AST{
|
||||
Constructors: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Constructor,
|
||||
Initializers: []ast.IntrinsicDecl{{
|
||||
Kind: ast.Initializer,
|
||||
Name: "F",
|
||||
ReturnType: &ast.TemplatedName{
|
||||
Name: "X",
|
||||
|
||||
Reference in New Issue
Block a user