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

vhdlpp: Corrected VTypeArray::write_to_stream(). 

Now it outputs "typedef(range)" instead of "array (range) of type".
This commit is contained in:
Maciej Suminski 2014-09-15 11:20:39 +02:00
parent cb03802a17
commit e330a0bd6e
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vhdlpp/parse_misc.cc
View File

@ -82,7 +82,8 @@ static const VType* calculate_subtype_array(const YYLTYPE&loc, const char*base_n
assert(array_left==0 || array_right!=0); assert(array_left==0 || array_right!=0);
// unfold typedef, if it is the case // unfold typedef, there might be VTypeArray inside
const VType*origin_type = base_type;
const VTypeDef*type_def = dynamic_cast<const VTypeDef*> (base_type); const VTypeDef*type_def = dynamic_cast<const VTypeDef*> (base_type);
if (type_def) { if (type_def) {
base_type = type_def->peek_definition(); base_type = type_def->peek_definition();
@ -99,7 +100,11 @@ static const VType* calculate_subtype_array(const YYLTYPE&loc, const char*base_n
range[0] = VTypeArray::range_t(array_left, array_right, downto); range[0] = VTypeArray::range_t(array_left, array_right, downto);
VTypeArray*subtype = new VTypeArray(base_array->element_type(), range, base_array->signed_vector()); // use typedef as the element type if possible
const VType*element = type_def ? origin_type : base_array->element_type();
VTypeArray*subtype = new VTypeArray(element, range,
base_array->signed_vector());
return subtype; return subtype;
} }

15
vhdlpp/vtype_stream.cc
View File

@ -47,7 +47,14 @@ void VTypeArray::write_to_stream(ostream&fd) const
return; return;
} }
fd << "array "; bool typedefed = false;
if(const VTypeDef*tdef = dynamic_cast<const VTypeDef*>(etype_)) {
tdef->write_to_stream(fd);
typedefed = true;
} else {
fd << "array ";
}
if (! ranges_.empty()) { if (! ranges_.empty()) {
assert(ranges_.size() < 2); assert(ranges_.size() < 2);
if (ranges_[0].is_box()) { if (ranges_[0].is_box()) {
@ -57,8 +64,10 @@ void VTypeArray::write_to_stream(ostream&fd) const
} }
} }
fd << "of "; if(!typedefed) {
etype_->write_to_stream(fd); fd << "of ";
etype_->write_to_stream(fd);
}
} }
void VTypeArray::write_range_to_stream_(std::ostream&fd) const void VTypeArray::write_range_to_stream_(std::ostream&fd) const