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
e5c9aaab
Commit
e5c9aaab
authored
Nov 10, 2009
by
Roberto Raggi
Browse files
Removed ObjCSelectorArgumentListAST
Done with Erik Verbruggen
parent
d358c89f
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/shared/cplusplus/AST.cpp
View file @
e5c9aaab
...
...
@@ -2047,25 +2047,6 @@ unsigned ObjCSelectorArgumentAST::lastToken() const
return
name_token
+
1
;
}
unsigned
ObjCSelectorArgumentListAST
::
firstToken
()
const
{
if
(
argument
)
return
argument
->
firstToken
();
// ### assert?
return
0
;
}
unsigned
ObjCSelectorArgumentListAST
::
lastToken
()
const
{
for
(
const
ObjCSelectorArgumentListAST
*
it
=
this
;
it
;
it
=
it
->
next
)
if
(
!
it
->
next
&&
it
->
argument
)
return
it
->
argument
->
lastToken
();
// ### assert?
return
0
;
}
unsigned
ObjCSelectorWithArgumentsAST
::
firstToken
()
const
{
return
selector_arguments
->
firstToken
();
...
...
src/shared/cplusplus/AST.h
View file @
e5c9aaab
...
...
@@ -2323,22 +2323,6 @@ protected:
virtual
void
accept0
(
ASTVisitor
*
visitor
);
};
class
CPLUSPLUS_EXPORT
ObjCSelectorArgumentListAST
:
public
AST
{
public:
ObjCSelectorArgumentAST
*
argument
;
ObjCSelectorArgumentListAST
*
next
;
public:
virtual
ObjCSelectorArgumentListAST
*
asObjCSelectorArgumentList
()
{
return
this
;
}
virtual
unsigned
firstToken
()
const
;
virtual
unsigned
lastToken
()
const
;
protected:
virtual
void
accept0
(
ASTVisitor
*
visitor
);
};
class
CPLUSPLUS_EXPORT
ObjCSelectorWithArgumentsAST
:
public
ObjCSelectorAST
{
public:
...
...
src/shared/cplusplus/ASTVisit.cpp
View file @
e5c9aaab
...
...
@@ -1006,14 +1006,6 @@ void ObjCSelectorArgumentAST::accept0(ASTVisitor *visitor)
visitor
->
endVisit
(
this
);
}
void
ObjCSelectorArgumentListAST
::
accept0
(
ASTVisitor
*
visitor
)
{
if
(
visitor
->
visit
(
this
))
{
accept
(
argument
,
visitor
);
}
visitor
->
endVisit
(
this
);
}
void
ObjCSelectorWithArgumentsAST
::
accept0
(
ASTVisitor
*
visitor
)
{
if
(
visitor
->
visit
(
this
))
{
...
...
src/shared/cplusplus/ASTfwd.h
View file @
e5c9aaab
...
...
@@ -144,7 +144,6 @@ class ObjCProtocolForwardDeclarationAST;
class
ObjCProtocolRefsAST
;
class
ObjCSelectorAST
;
class
ObjCSelectorArgumentAST
;
class
ObjCSelectorArgumentListAST
;
class
ObjCSelectorExpressionAST
;
class
ObjCSelectorWithArgumentsAST
;
class
ObjCSelectorWithoutArgumentsAST
;
...
...
@@ -201,6 +200,7 @@ typedef List<StatementAST *> StatementListAST;
typedef
List
<
DeclaratorAST
*>
DeclaratorListAST
;
typedef
List
<
NameAST
*>
ObjCIdentifierListAST
;
typedef
List
<
ObjCMessageArgumentAST
*>
ObjCMessageArgumentListAST
;
typedef
List
<
ObjCSelectorArgumentAST
*>
ObjCSelectorArgumentListAST
;
typedef
ExpressionListAST
TemplateArgumentListAST
;
...
...
src/shared/cplusplus/CheckName.cpp
View file @
e5c9aaab
...
...
@@ -389,7 +389,7 @@ bool CheckName::visit(ObjCSelectorWithArgumentsAST *ast)
{
std
::
vector
<
Name
*>
names
;
for
(
ObjCSelectorArgumentListAST
*
it
=
ast
->
selector_arguments
;
it
;
it
=
it
->
next
)
{
Identifier
*
id
=
identifier
(
it
->
argument
->
name_token
);
Identifier
*
id
=
identifier
(
it
->
value
->
name_token
);
Name
*
name
=
control
()
->
nameId
(
id
);
names
.
push_back
(
name
);
...
...
src/shared/cplusplus/Parser.cpp
View file @
e5c9aaab
...
...
@@ -3180,16 +3180,16 @@ bool Parser::parseObjCSelectorExpression(ExpressionAST *&node)
ast
->
selector
=
args
;
ObjCSelectorArgumentListAST
*
last
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
args
->
selector_arguments
=
last
;
last
->
argument
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
last
->
argument
->
name_token
=
identifier_token
;
last
->
argument
->
colon_token
=
consumeToken
();
last
->
value
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
last
->
value
->
name_token
=
identifier_token
;
last
->
value
->
colon_token
=
consumeToken
();
while
(
LA
()
!=
T_RPAREN
)
{
last
->
next
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
last
=
last
->
next
;
last
->
argument
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
match
(
T_IDENTIFIER
,
&
(
last
->
argument
->
name_token
));
match
(
T_COLON
,
&
(
last
->
argument
->
colon_token
));
last
->
value
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
match
(
T_IDENTIFIER
,
&
(
last
->
value
->
name_token
));
match
(
T_COLON
,
&
(
last
->
value
->
colon_token
));
}
}
else
{
ObjCSelectorWithoutArgumentsAST
*
args
=
new
(
_pool
)
ObjCSelectorWithoutArgumentsAST
;
...
...
@@ -3253,7 +3253,7 @@ bool Parser::parseObjCMessageArguments(ObjCSelectorAST *&selNode, ObjCMessageArg
if
(
parseObjCSelectorArg
(
selectorArgument
,
messageArgument
))
{
ObjCSelectorArgumentListAST
*
selAst
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
selAst
->
argument
=
selectorArgument
;
selAst
->
value
=
selectorArgument
;
ObjCSelectorArgumentListAST
*
lastSelector
=
selAst
;
ObjCMessageArgumentListAST
*
argAst
=
new
(
_pool
)
ObjCMessageArgumentListAST
;
...
...
@@ -3264,7 +3264,7 @@ bool Parser::parseObjCMessageArguments(ObjCSelectorAST *&selNode, ObjCMessageArg
// accept the selector args.
lastSelector
->
next
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
lastSelector
=
lastSelector
->
next
;
lastSelector
->
argument
=
selectorArgument
;
lastSelector
->
value
=
selectorArgument
;
lastArgument
->
next
=
new
(
_pool
)
ObjCMessageArgumentListAST
;
lastArgument
=
lastArgument
->
next
;
...
...
@@ -4896,7 +4896,7 @@ bool Parser::parseObjCMethodPrototype(ObjCMethodPrototypeAST *&node)
ast
->
selector
=
sel
;
ObjCSelectorArgumentListAST
*
lastSel
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
sel
->
selector_arguments
=
lastSel
;
sel
->
selector_arguments
->
argument
=
argument
;
sel
->
selector_arguments
->
value
=
argument
;
ast
->
arguments
=
new
(
_pool
)
ObjCMessageArgumentDeclarationListAST
;
ast
->
arguments
->
argument_declaration
=
declaration
;
...
...
@@ -4905,7 +4905,7 @@ bool Parser::parseObjCMethodPrototype(ObjCMethodPrototypeAST *&node)
while
(
parseObjCKeywordDeclaration
(
argument
,
declaration
))
{
lastSel
->
next
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
lastSel
=
lastSel
->
next
;
lastSel
->
argument
=
argument
;
lastSel
->
value
=
argument
;
lastArg
->
next
=
new
(
_pool
)
ObjCMessageArgumentDeclarationListAST
;
lastArg
=
lastArg
->
next
;
...
...
@@ -4982,9 +4982,9 @@ bool Parser::parseObjCPropertyAttribute(ObjCPropertyAttributeAST *&node)
match
(
T_EQUAL
,
&
(
node
->
equals_token
));
ObjCSelectorWithArgumentsAST
*
selector
=
new
(
_pool
)
ObjCSelectorWithArgumentsAST
;
selector
->
selector_arguments
=
new
(
_pool
)
ObjCSelectorArgumentListAST
;
selector
->
selector_arguments
->
argument
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
match
(
T_IDENTIFIER
,
&
(
selector
->
selector_arguments
->
argument
->
name_token
));
match
(
T_COLON
,
&
(
selector
->
selector_arguments
->
argument
->
colon_token
));
selector
->
selector_arguments
->
value
=
new
(
_pool
)
ObjCSelectorArgumentAST
;
match
(
T_IDENTIFIER
,
&
(
selector
->
selector_arguments
->
value
->
name_token
));
match
(
T_COLON
,
&
(
selector
->
selector_arguments
->
value
->
colon_token
));
node
->
method_selector
=
selector
;
return
true
;
}
...
...
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