Skip to content
GitLab
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
2d683cd2
Commit
2d683cd2
authored
Aug 16, 2010
by
Roberto Raggi
Browse files
Renamed DeclaratorAST::equals_token
parent
2e0cb24c
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/cppeditor/cppquickfixes.cpp
View file @
2d683cd2
...
...
@@ -629,7 +629,7 @@ public:
if
(
!
op
->
core
)
return
noResult
();
else
if
(
!
declarator
->
equal
s
_token
)
else
if
(
!
declarator
->
equal_token
)
return
noResult
();
else
if
(
!
declarator
->
initializer
)
...
...
src/shared/cplusplus/AST.cpp
View file @
2d683cd2
...
...
@@ -896,8 +896,8 @@ unsigned DeclaratorAST::firstToken() const
if
(
post_attribute_list
)
if
(
unsigned
candidate
=
post_attribute_list
->
firstToken
())
return
candidate
;
if
(
equal
s
_token
)
return
equal
s
_token
;
if
(
equal_token
)
return
equal_token
;
if
(
initializer
)
if
(
unsigned
candidate
=
initializer
->
firstToken
())
return
candidate
;
...
...
@@ -910,8 +910,8 @@ unsigned DeclaratorAST::lastToken() const
if
(
initializer
)
if
(
unsigned
candidate
=
initializer
->
lastToken
())
return
candidate
;
if
(
equal
s
_token
)
return
equal
s
_token
+
1
;
if
(
equal_token
)
return
equal_token
+
1
;
if
(
post_attribute_list
)
if
(
unsigned
candidate
=
post_attribute_list
->
lastToken
())
return
candidate
;
...
...
src/shared/cplusplus/AST.h
View file @
2d683cd2
...
...
@@ -574,7 +574,7 @@ public:
CoreDeclaratorAST
*
core_declarator
;
PostfixDeclaratorListAST
*
postfix_declarator_list
;
SpecifierListAST
*
post_attribute_list
;
unsigned
equal
s
_token
;
unsigned
equal_token
;
ExpressionAST
*
initializer
;
public:
...
...
@@ -584,7 +584,7 @@ public:
,
core_declarator
(
0
)
,
postfix_declarator_list
(
0
)
,
post_attribute_list
(
0
)
,
equal
s
_token
(
0
)
,
equal_token
(
0
)
,
initializer
(
0
)
{}
...
...
src/shared/cplusplus/ASTClone.cpp
View file @
2d683cd2
...
...
@@ -119,7 +119,7 @@ DeclaratorAST *DeclaratorAST::clone(MemoryPool *pool) const
for
(
SpecifierListAST
*
iter
=
post_attribute_list
,
**
ast_iter
=
&
ast
->
post_attribute_list
;
iter
;
iter
=
iter
->
next
,
ast_iter
=
&
(
*
ast_iter
)
->
next
)
*
ast_iter
=
new
(
pool
)
SpecifierListAST
((
iter
->
value
)
?
iter
->
value
->
clone
(
pool
)
:
0
);
ast
->
equal
s
_token
=
equal
s
_token
;
ast
->
equal_token
=
equal_token
;
if
(
initializer
)
ast
->
initializer
=
initializer
->
clone
(
pool
);
return
ast
;
...
...
src/shared/cplusplus/ASTMatcher.cpp
View file @
2d683cd2
...
...
@@ -175,7 +175,7 @@ bool ASTMatcher::match(DeclaratorAST *node, DeclaratorAST *pattern)
else
if
(
!
AST
::
match
(
node
->
post_attribute_list
,
pattern
->
post_attribute_list
,
this
))
return
false
;
pattern
->
equal
s
_token
=
node
->
equal
s
_token
;
pattern
->
equal_token
=
node
->
equal_token
;
if
(
!
pattern
->
initializer
)
pattern
->
initializer
=
node
->
initializer
;
...
...
src/shared/cplusplus/Bind.cpp
View file @
2d683cd2
...
...
@@ -1737,7 +1737,7 @@ bool Bind::visit(SimpleDeclarationAST *ast)
if
(
Function
*
funTy
=
decl
->
type
()
->
asFunctionType
())
{
funTy
->
setMethodKey
(
_methodKey
);
if
(
funTy
->
isVirtual
()
&&
it
->
value
->
equal
s
_token
)
if
(
funTy
->
isVirtual
()
&&
it
->
value
->
equal_token
)
funTy
->
setPureVirtual
(
true
);
}
}
...
...
src/shared/cplusplus/Parser.cpp
View file @
2d683cd2
...
...
@@ -1303,7 +1303,7 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, bool stopAtCppInitializer)
ExpressionAST
*
initializer
=
0
;
bool
blocked
=
blockErrors
(
true
);
if
(
parseInitializer
(
initializer
,
&
node
->
equal
s
_token
))
{
if
(
parseInitializer
(
initializer
,
&
node
->
equal_token
))
{
NestedExpressionAST
*
expr
=
0
;
if
(
initializer
)
expr
=
initializer
->
asNestedExpression
();
...
...
@@ -2296,7 +2296,7 @@ bool Parser::parseInitDeclarator(DeclaratorAST *&node,
}
rewind
(
colon_token
);
}
else
if
(
LA
()
==
T_EQUAL
||
(
!
acceptStructDeclarator
&&
LA
()
==
T_LPAREN
))
{
parseInitializer
(
node
->
initializer
,
&
node
->
equal
s
_token
);
parseInitializer
(
node
->
initializer
,
&
node
->
equal_token
);
}
return
true
;
}
...
...
@@ -2853,7 +2853,7 @@ bool Parser::isPointerDeclaration(DeclarationStatementAST *ast) const
if
(
spec
->
value
->
asNamedTypeSpecifier
()
&&
!
spec
->
next
)
{
if
(
DeclaratorListAST
*
declarators
=
declaration
->
declarator_list
)
{
if
(
DeclaratorAST
*
declarator
=
declarators
->
value
)
{
if
(
declarator
->
ptr_operator_list
&&
declarator
->
equal
s
_token
&&
declarator
->
initializer
)
{
if
(
declarator
->
ptr_operator_list
&&
declarator
->
equal_token
&&
declarator
->
initializer
)
{
return
true
;
}
}
...
...
@@ -2952,7 +2952,7 @@ bool Parser::parseCondition(ExpressionAST *&node)
if
(
parseTypeSpecifier
(
type_specifier
))
{
DeclaratorAST
*
declarator
=
0
;
if
(
parseInitDeclarator
(
declarator
,
/*acceptStructDeclarator=*/
false
))
{
if
(
declarator
->
initializer
&&
declarator
->
equal
s
_token
)
{
if
(
declarator
->
initializer
&&
declarator
->
equal_token
)
{
ConditionAST
*
ast
=
new
(
_pool
)
ConditionAST
;
ast
->
type_specifier_list
=
type_specifier
;
ast
->
declarator
=
declarator
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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