luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhdlpp: Elaborate ExpAttribute arguments.

This commit is contained in:
Maciej Suminski 2016-01-15 16:24:13 +01:00
parent 3af3c12b11
commit 03434efed3
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vhdlpp/expression.cc
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2011-2013 Stephen Williams (steve@icarus.com) * Copyright (c) 2011-2013 Stephen Williams (steve@icarus.com)
* Copyright CERN 2012-2015 / Stephen Williams (steve@icarus.com), * Copyright CERN 2012-2015 / Stephen Williams (steve@icarus.com),
* Copyright CERN 2016
* @author Maciej Suminski (maciej.suminski@cern.ch) * @author Maciej Suminski (maciej.suminski@cern.ch)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it

3
vhdlpp/expression.h
View File

@ -3,6 +3,7 @@
/* /*
* Copyright (c) 2011-2014 Stephen Williams (steve@icarus.com) * Copyright (c) 2011-2014 Stephen Williams (steve@icarus.com)
* Copyright CERN 2015 / Stephen Williams (steve@icarus.com), * Copyright CERN 2015 / Stephen Williams (steve@icarus.com),
* Copyright CERN 2016
* @author Maciej Suminski (maciej.suminski@cern.ch) * @author Maciej Suminski (maciej.suminski@cern.ch)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
@ -366,7 +367,9 @@ class ExpAttribute : public Expression {
protected: protected:
std::list<Expression*>*clone_args() const; std::list<Expression*>*clone_args() const;
int elaborate_args(Entity*ent, ScopeBase*scope, const VType*ltype);
void visit_args(ExprVisitor& func); void visit_args(ExprVisitor& func);
bool evaluate_type_attr(const VType*type, Entity*ent, ScopeBase*scope, int64_t&val) const; bool evaluate_type_attr(const VType*type, Entity*ent, ScopeBase*scope, int64_t&val) const;
bool test_array_type(const VType*type) const; bool test_array_type(const VType*type) const;

28
vhdlpp/expression_elaborate.cc
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2011-2013 Stephen Williams (steve@icarus.com) * Copyright (c) 2011-2013 Stephen Williams (steve@icarus.com)
* Copyright CERN 2012-2013 / Stephen Williams (steve@icarus.com) * Copyright CERN 2012-2013 / Stephen Williams (steve@icarus.com)
* Copyright CERN 2016
* @author Maciej Suminski (maciej.suminski@cern.ch)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -583,10 +585,29 @@ const VType* ExpArithmetic::resolve_operand_types_(const VType*t1, const VType*t
return 0; return 0;
} }
int ExpAttribute::elaborate_args(Entity*ent, ScopeBase*scope, const VType*ltype)
{
int errors = 0;
if(args_) {
for(list<Expression*>::iterator it = args_->begin();
it != args_->end(); ++it) {
errors += (*it)->elaborate_expr(ent, scope, ltype);
}
}
return errors;
}
int ExpObjAttribute::elaborate_expr(Entity*ent, ScopeBase*scope, const VType*) int ExpObjAttribute::elaborate_expr(Entity*ent, ScopeBase*scope, const VType*)
{ {
int errors = 0;
const VType*sub_type = base_->probe_type(ent, scope); const VType*sub_type = base_->probe_type(ent, scope);
return base_->elaborate_expr(ent, scope, sub_type);
errors += elaborate_args(ent, scope, sub_type);
errors += base_->elaborate_expr(ent, scope, sub_type);
return errors;
} }
const VType* ExpObjAttribute::probe_type(Entity*, ScopeBase*) const const VType* ExpObjAttribute::probe_type(Entity*, ScopeBase*) const
@ -597,10 +618,9 @@ const VType* ExpObjAttribute::probe_type(Entity*, ScopeBase*) const
return NULL; return NULL;
} }
int ExpTypeAttribute::elaborate_expr(Entity*, ScopeBase*, const VType*) int ExpTypeAttribute::elaborate_expr(Entity*ent, ScopeBase*scope, const VType*ltype)
{ {
// This is just to mute warnings, there is nothing to elaborate here return elaborate_args(ent, scope, ltype);
return 0;
} }
const VType* ExpTypeAttribute::probe_type(Entity*, ScopeBase*) const const VType* ExpTypeAttribute::probe_type(Entity*, ScopeBase*) const