string combined;
for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
- append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+ if(j->source!=INTERNAL_SOURCE)
+ append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
return combined;
}
if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
;
else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
- flags |= RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+ flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
flags |= RESOLVE_EXPRESSIONS;
else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
}
if(ExpressionInliner().apply(stage))
{
- resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
any_inlined = true;
}