diff --git a/vhdlpp/expression.h b/vhdlpp/expression.h index 595734737..d570d3cee 100644 --- a/vhdlpp/expression.h +++ b/vhdlpp/expression.h @@ -305,7 +305,6 @@ class ExpAggregate : public Expression { Expression*clone() const; - const VType*probe_type(Entity*ent, ScopeBase*scope) const; const VType*fit_type(Entity*ent, ScopeBase*scope, const VTypeArray*atype) const; int elaborate_expr(Entity*ent, ScopeBase*scope, const VType*ltype); void write_to_stream(std::ostream&fd) const; @@ -731,7 +730,6 @@ class ExpNameALL : public ExpName { ExpNameALL() : ExpName(perm_string()) { } public: - int elaborate_lval(Entity*ent, ScopeBase*scope, bool); const VType* probe_type(Entity*ent, ScopeBase*scope) const; void dump(ostream&out, int indent =0) const; }; diff --git a/vhdlpp/expression_elaborate.cc b/vhdlpp/expression_elaborate.cc index fbe7f0ec2..29a0e60b3 100644 --- a/vhdlpp/expression_elaborate.cc +++ b/vhdlpp/expression_elaborate.cc @@ -316,11 +316,6 @@ int ExpName::elaborate_rval(Entity*ent, ScopeBase*scope, const InterfacePort*lva return errors; } -int ExpNameALL::elaborate_lval(Entity*ent, ScopeBase*scope, bool is_sequ) -{ - return Expression::elaborate_lval(ent, scope, is_sequ); -} - int Expression::elaborate_expr(Entity*, ScopeBase*, const VType*) { cerr << get_fileline() << ": internal error: I don't know how to elaborate expression type=" << typeid(*this).name() << endl; @@ -388,11 +383,6 @@ int ExpUnary::elaborate_expr(Entity*ent, ScopeBase*scope, const VType*ltype) return operand1_->elaborate_expr(ent, scope, ltype); } -const VType*ExpAggregate::probe_type(Entity*ent, ScopeBase*scope) const -{ - return Expression::probe_type(ent, scope); -} - const VType*ExpAggregate::fit_type(Entity*, ScopeBase*, const VTypeArray*host) const { ivl_assert(*this, elements_.size() == 1); diff --git a/vhdlpp/sequential.h b/vhdlpp/sequential.h index 89bd38bfd..a952981c0 100644 --- a/vhdlpp/sequential.h +++ b/vhdlpp/sequential.h @@ -297,7 +297,8 @@ class ReportStmt : public SequentialStmt { class AssertStmt : public ReportStmt { public: - AssertStmt(Expression*condition, const char*message, ReportStmt::severity_t severity = ReportStmt::ERROR); + AssertStmt(Expression*condition, const char*message, + ReportStmt::severity_t severity = ReportStmt::ERROR); void dump(ostream&out, int indent) const; int elaborate(Entity*ent, ScopeBase*scope);