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

vhdlpp: VTypeArray stores parent type, in case it is a subtype.

This commit is contained in:
Maciej Suminski 2015-01-23 17:07:19 +01:00
parent 9ba7694484
commit 774609fbbb
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vhdlpp/parse_misc.cc
View File

@ -105,6 +105,7 @@ static const VType* calculate_subtype_array(const YYLTYPE&loc, const char*base_n
VTypeArray*subtype = new VTypeArray(element, range,
base_array->signed_vector());
subtype->set_parent_type(base_array);
return subtype;
}

4
vhdlpp/vtype.cc
View File

@ -77,7 +77,7 @@ void VTypePrimitive::show(ostream&out) const
}
VTypeArray::VTypeArray(const VType*element, const vector<VTypeArray::range_t>&r, bool sv)
: etype_(element), ranges_(r), signed_flag_(sv)
: etype_(element), ranges_(r), signed_flag_(sv), parent_(NULL)
{
}
@ -89,7 +89,7 @@ VTypeArray::VTypeArray(const VType*element, const vector<VTypeArray::range_t>&r,
* this is a memory leak. Something to fix.
*/
VTypeArray::VTypeArray(const VType*element, std::list<prange_t*>*r, bool sv)
: etype_(element), ranges_(r->size()), signed_flag_(sv)
: etype_(element), ranges_(r->size()), signed_flag_(sv), parent_(NULL)
{
for (size_t idx = 0 ; idx < ranges_.size() ; idx += 1) {
prange_t*curp = r->front();

6
vhdlpp/vtype.h
View File

@ -212,7 +212,7 @@ class VTypeArray : public VType {
inline bool signed_vector() const { return signed_flag_; }
// returns the type of element held in the array
inline const VType* element_type() const { return etype_; }
inline const VType* element_type() const { return parent_ ? parent_->element_type() : etype_; }
// returns the basic type of element held in the array
// (unfolds typedefs and multidimensional arrays)
@ -227,6 +227,9 @@ class VTypeArray : public VType {
bool is_unbounded() const;
// To handle subtypes
inline void set_parent_type(const VTypeArray*parent) { parent_ = parent; }
private:
int emit_with_dims_(std::ostream&out, bool packed, perm_string name) const;
@ -235,6 +238,7 @@ class VTypeArray : public VType {
std::vector<range_t> ranges_;
bool signed_flag_;
const VTypeArray*parent_;
};
class VTypeRange : public VType {