+#include <msp/core/algorithm.h>
#include "reflect.h"
using namespace std;
return from.size<=to.size;
else if(from.kind!=to.kind)
return false;
+ else if(from.kind==BasicTypeDeclaration::INT && from.sign!=to.sign)
+ return from.sign && from.size<=to.size;
else if(is_vector_or_matrix(from) && from.size==to.size)
{
BasicTypeDeclaration *from_base = dynamic_cast<BasicTypeDeclaration *>(from.base_type);
{
if(BasicTypeDeclaration *basic1 = multi_visit(basic))
{
- if(basic1->kind!=basic.kind || basic1->size!=basic.size)
+ if(basic1->kind!=basic.kind || basic1->size!=basic.size || basic1->sign!=basic.sign)
r_result = false;
else if(basic1->base_type && basic.base_type)
compare(*basic1->base_type, *basic.base_type);
else
{
r_result = true;
- NodeList<Statement>::const_iterator i = strct1->members.body.begin();
- NodeList<Statement>::const_iterator j = strct.members.body.begin();
+ auto i = strct1->members.body.begin();
+ auto j = strct.members.body.begin();
for(; (r_result && i!=strct1->members.body.end()); ++i, ++j)
compare(**i, **j);
}
void LocationCounter::visit(StructDeclaration &strct)
{
unsigned total = 0;
- for(NodeList<Statement>::const_iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+ for(const RefPtr<Statement> &s: strct.members.body)
{
r_count = 1;
- (*i)->visit(*this);
+ s->visit(*this);
total += r_count;
}
r_count = total;
{
unsigned total = 0;
unsigned max_align = 1;
- for(NodeList<Statement>::iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+ for(const RefPtr<Statement> &s: strct.members.body)
{
r_size = 0;
r_alignment = 1;
r_offset = -1;
- (*i)->visit(*this);
+ s->visit(*this);
if(r_offset)
total = r_offset;
total += r_alignment-1;
{
if(var.layout)
{
- const vector<Layout::Qualifier> qualifiers = var.layout->qualifiers;
- for(vector<Layout::Qualifier>::const_iterator i=qualifiers.begin(); (r_offset<0 && i!=qualifiers.end()); ++i)
- if(i->name=="offset")
- r_offset = i->value;
+ auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name);
+ if(i!=var.layout->qualifiers.end())
+ r_offset = i->value;
}
if(var.type_declaration)
if(call.declaration)
{
dependencies.insert(call.declaration);
- call.declaration->visit(*this);
+ if(call.declaration->definition)
+ call.declaration->definition->visit(*this);
}
TraversingVisitor::visit(call);
}