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
Tobias Hunger
qt-creator
Commits
4c246763
Commit
4c246763
authored
Nov 10, 2009
by
Roberto Raggi
Browse files
Removed ObjCMessageArgumentDeclarationListAST
Done with Erik Verbruggen
parent
98802456
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/shared/cplusplus/AST.cpp
View file @
4c246763
...
...
@@ -2155,28 +2155,6 @@ unsigned ObjCMessageArgumentDeclarationAST::lastToken() const
return
0
;
}
unsigned
ObjCMessageArgumentDeclarationListAST
::
firstToken
()
const
{
if
(
argument_declaration
)
return
argument_declaration
->
firstToken
();
else
if
(
next
)
return
next
->
firstToken
();
else
// ### Assert?
return
0
;
}
unsigned
ObjCMessageArgumentDeclarationListAST
::
lastToken
()
const
{
for
(
const
ObjCMessageArgumentDeclarationListAST
*
it
=
this
;
it
;
it
=
it
->
next
)
{
if
(
!
it
->
next
&&
it
->
argument_declaration
)
{
return
it
->
argument_declaration
->
lastToken
();
}
}
// ### assert?
return
0
;
}
unsigned
ObjCMethodPrototypeAST
::
firstToken
()
const
{
return
method_type_token
;
...
...
src/shared/cplusplus/AST.h
View file @
4c246763
...
...
@@ -2445,22 +2445,6 @@ protected:
virtual
void
accept0
(
ASTVisitor
*
visitor
);
};
class
CPLUSPLUS_EXPORT
ObjCMessageArgumentDeclarationListAST
:
public
AST
{
public:
ObjCMessageArgumentDeclarationAST
*
argument_declaration
;
ObjCMessageArgumentDeclarationListAST
*
next
;
public:
virtual
ObjCMessageArgumentDeclarationListAST
*
asObjCMessageArgumentDeclarationList
()
{
return
this
;
}
virtual
unsigned
firstToken
()
const
;
virtual
unsigned
lastToken
()
const
;
protected:
virtual
void
accept0
(
ASTVisitor
*
visitor
);
};
class
CPLUSPLUS_EXPORT
ObjCMethodPrototypeAST
:
public
AST
{
public:
...
...
src/shared/cplusplus/ASTVisit.cpp
View file @
4c246763
...
...
@@ -1069,14 +1069,6 @@ void ObjCMessageArgumentDeclarationAST::accept0(ASTVisitor *visitor)
visitor
->
endVisit
(
this
);
}
void
ObjCMessageArgumentDeclarationListAST
::
accept0
(
ASTVisitor
*
visitor
)
{
if
(
visitor
->
visit
(
this
))
{
accept
(
argument_declaration
,
visitor
);
}
visitor
->
endVisit
(
this
);
}
void
ObjCMethodPrototypeAST
::
accept0
(
ASTVisitor
*
visitor
)
{
if
(
visitor
->
visit
(
this
))
{
...
...
src/shared/cplusplus/ASTfwd.h
View file @
4c246763
...
...
@@ -131,7 +131,6 @@ class ObjCFastEnumerationAST;
class
ObjCInstanceVariablesDeclarationAST
;
class
ObjCMessageArgumentAST
;
class
ObjCMessageArgumentDeclarationAST
;
class
ObjCMessageArgumentDeclarationListAST
;
class
ObjCMessageExpressionAST
;
class
ObjCMethodDeclarationAST
;
class
ObjCMethodPrototypeAST
;
...
...
@@ -201,6 +200,7 @@ typedef List<NameAST *> ObjCIdentifierListAST;
typedef
List
<
ObjCMessageArgumentAST
*>
ObjCMessageArgumentListAST
;
typedef
List
<
ObjCSelectorArgumentAST
*>
ObjCSelectorArgumentListAST
;
typedef
List
<
ObjCPropertyAttributeAST
*>
ObjCPropertyAttributeListAST
;
typedef
List
<
ObjCMessageArgumentDeclarationAST
*>
ObjCMessageArgumentDeclarationListAST
;
typedef
ExpressionListAST
TemplateArgumentListAST
;
...
...
src/shared/cplusplus/CheckDeclarator.cpp
View file @
4c246763
...
...
@@ -267,7 +267,7 @@ bool CheckDeclarator::visit(ObjCMethodPrototypeAST *ast)
if
(
ast
->
selector
&&
ast
->
selector
->
asObjCSelectorWithArguments
())
{
// TODO: add arguments (EV)
for
(
ObjCMessageArgumentDeclarationListAST
*
it
=
ast
->
arguments
;
it
;
it
=
it
->
next
)
{
ObjCMessageArgumentDeclarationAST
*
argDecl
=
it
->
argument_declaration
;
ObjCMessageArgumentDeclarationAST
*
argDecl
=
it
->
value
;
semantic
()
->
check
(
argDecl
,
method
->
arguments
());
}
...
...
src/shared/cplusplus/Parser.cpp
View file @
4c246763
...
...
@@ -4899,7 +4899,7 @@ bool Parser::parseObjCMethodPrototype(ObjCMethodPrototypeAST *&node)
sel
->
selector_arguments
->
value
=
argument
;
ast
->
arguments
=
new
(
_pool
)
ObjCMessageArgumentDeclarationListAST
;
ast
->
arguments
->
argument_declaration
=
declaration
;
ast
->
arguments
->
value
=
declaration
;
ObjCMessageArgumentDeclarationListAST
*
lastArg
=
ast
->
arguments
;
while
(
parseObjCKeywordDeclaration
(
argument
,
declaration
))
{
...
...
@@ -4909,7 +4909,7 @@ bool Parser::parseObjCMethodPrototype(ObjCMethodPrototypeAST *&node)
lastArg
->
next
=
new
(
_pool
)
ObjCMessageArgumentDeclarationListAST
;
lastArg
=
lastArg
->
next
;
lastArg
->
argument_declaration
=
declaration
;
lastArg
->
value
=
declaration
;
}
while
(
LA
()
==
T_COMMA
)
{
...
...
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