Commit 833f097c authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Get rid of Function::block/setBlock.

parent 5cc32e10
......@@ -1905,7 +1905,6 @@ bool Bind::visit(FunctionDefinitionAST *ast)
if (CompoundStatementAST *c = ast->function_body->asCompoundStatement()) {
if (c->symbol) {
fun->setBlock(c->symbol);
fun->setEndOffset(c->symbol->endOffset());
}
}
......
......@@ -164,7 +164,6 @@ void TypenameArgument::visitSymbol0(SymbolVisitor *visitor)
Function::Function(TranslationUnit *translationUnit, unsigned sourceLocation, const Name *name)
: Scope(translationUnit, sourceLocation, name),
_block(0),
_flags(0)
{ }
......@@ -189,12 +188,6 @@ int Function::methodKey() const
void Function::setMethodKey(int key)
{ f._methodKey = key; }
Block *Function::block() const
{ return _block; }
void Function::setBlock(Block *block)
{ _block = block; }
bool Function::isEqualTo(const Type *other) const
{
const Function *o = other->asFunctionType();
......@@ -293,10 +286,10 @@ bool Function::hasReturnType() const
unsigned Function::argumentCount() const
{
if (_block)
return memberCount() - 1;
return memberCount();
const unsigned c = memberCount();
if (c > 0 && memberAt(c - 1)->isBlock())
return c - 1;
return c;
}
Symbol *Function::argumentAt(unsigned index) const
......
......@@ -297,9 +297,6 @@ public:
int methodKey() const;
void setMethodKey(int key);
Block *block() const;
void setBlock(Block *block);
FullySpecifiedType returnType() const;
void setReturnType(const FullySpecifiedType &returnType);
......@@ -360,7 +357,6 @@ protected:
private:
FullySpecifiedType _returnType;
Block *_block;
struct Flags {
unsigned _isVirtual: 1;
unsigned _isVariadic: 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment