Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
21fdc2d0
Commit
21fdc2d0
authored
Feb 17, 2010
by
Erik Verbruggen
Browse files
Replaced usages of concrete type SimpleNameAST with the abstract NameAST.
parent
656de733
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/shared/cplusplus/AST.h
View file @
21fdc2d0
...
@@ -577,7 +577,7 @@ public:
...
@@ -577,7 +577,7 @@ public:
unsigned
property_specifier_token
;
unsigned
property_specifier_token
;
unsigned
lparen_token
;
unsigned
lparen_token
;
ExpressionAST
*
type_id
;
ExpressionAST
*
type_id
;
Simple
NameAST
*
property_name
;
NameAST
*
property_name
;
QtPropertyDeclarationItemListAST
*
property_declaration_items
;
QtPropertyDeclarationItemListAST
*
property_declaration_items
;
unsigned
rparen_token
;
unsigned
rparen_token
;
...
@@ -2931,7 +2931,7 @@ class CPLUSPLUS_EXPORT ObjCMessageArgumentDeclarationAST: public AST
...
@@ -2931,7 +2931,7 @@ class CPLUSPLUS_EXPORT ObjCMessageArgumentDeclarationAST: public AST
public:
public:
ObjCTypeNameAST
*
type_name
;
ObjCTypeNameAST
*
type_name
;
SpecifierListAST
*
attribute_list
;
SpecifierListAST
*
attribute_list
;
Simple
NameAST
*
param_name
;
NameAST
*
param_name
;
public:
// annotations
public:
// annotations
Argument
*
argument
;
Argument
*
argument
;
...
...
src/shared/cplusplus/Parser.cpp
View file @
21fdc2d0
...
@@ -1792,8 +1792,9 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
...
@@ -1792,8 +1792,9 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
if
(
LA
()
==
T_LPAREN
)
{
if
(
LA
()
==
T_LPAREN
)
{
ast
->
lparen_token
=
consumeToken
();
ast
->
lparen_token
=
consumeToken
();
parseTypeId
(
ast
->
type_id
);
parseTypeId
(
ast
->
type_id
);
ast
->
property_name
=
new
(
_pool
)
SimpleNameAST
;
SimpleNameAST
*
property_name
=
new
(
_pool
)
SimpleNameAST
;
match
(
T_IDENTIFIER
,
&
ast
->
property_name
->
identifier_token
);
match
(
T_IDENTIFIER
,
&
property_name
->
identifier_token
);
ast
->
property_name
=
property_name
;
QtPropertyDeclarationItemListAST
**
iter
=
&
ast
->
property_declaration_items
;
QtPropertyDeclarationItemListAST
**
iter
=
&
ast
->
property_declaration_items
;
while
(
true
)
{
while
(
true
)
{
if
(
LA
()
==
T_RPAREN
)
{
if
(
LA
()
==
T_RPAREN
)
{
...
@@ -5277,8 +5278,9 @@ bool Parser::parseObjCKeywordDeclaration(ObjCSelectorArgumentAST *&argument, Obj
...
@@ -5277,8 +5278,9 @@ bool Parser::parseObjCKeywordDeclaration(ObjCSelectorArgumentAST *&argument, Obj
while
(
parseAttributeSpecifier
(
*
attr
))
while
(
parseAttributeSpecifier
(
*
attr
))
attr
=
&
(
*
attr
)
->
next
;
attr
=
&
(
*
attr
)
->
next
;
node
->
param_name
=
new
(
_pool
)
SimpleNameAST
;
SimpleNameAST
*
param_name
=
new
(
_pool
)
SimpleNameAST
;
match
(
T_IDENTIFIER
,
&
node
->
param_name
->
identifier_token
);
match
(
T_IDENTIFIER
,
&
param_name
->
identifier_token
);
node
->
param_name
=
param_name
;
return
true
;
return
true
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment