void ProgramCompiler::append_module(ProgramSyntax::Module &mod)
{
- list<Import *> imports = apply<NodeGatherer<Import> >(mod.shared);
- for(list<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
+ vector<Import *> imports = apply<NodeGatherer<Import> >(mod.shared);
+ for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
import((*i)->module);
apply<NodeRemover>(mod.shared, set<Node *>(imports.begin(), imports.end()));
apply<InterfaceGenerator>(stage);
apply<VariableResolver>(stage);
apply<DeclarationReorderer>(stage);
+ apply<FunctionResolver>(stage);
apply<LegacyConverter>(stage);
}
ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
+ scope_level(0),
kind(NO_DECLARATION)
{ }
+void ProgramCompiler::DeclarationReorderer::visit(FunctionCall &call)
+{
+ FunctionDeclaration *def = call.declaration;
+ if(def)
+ def = def->definition;
+ if(def && !ordered_funcs.count(def))
+ needed_funcs.insert(def);
+}
+
void ProgramCompiler::DeclarationReorderer::visit(Block &block)
{
+ SetForScope<unsigned> set(scope_level, scope_level+1);
+ if(scope_level>1)
+ return Visitor::visit(block);
+
list<RefPtr<Node> >::iterator struct_insert_point = block.body.end();
list<RefPtr<Node> >::iterator variable_insert_point = block.body.end();
+ list<RefPtr<Node> >::iterator function_insert_point = block.body.end();
+ unsigned unordered_func_count = 0;
+ bool ordered_any_funcs = false;
for(list<RefPtr<Node> >::iterator i=block.body.begin(); i!=block.body.end(); )
{
else if(kind>VARIABLE && variable_insert_point==block.body.end())
variable_insert_point = i;
+ if(kind==FUNCTION)
+ {
+ if(function_insert_point==block.body.end())
+ function_insert_point = i;
+
+ if(needed_funcs.empty())
+ {
+ ordered_funcs.insert(i->get());
+ if(i!=function_insert_point)
+ {
+ block.body.insert(function_insert_point, *i);
+ moved = true;
+ }
+ else
+ ++function_insert_point;
+ ordered_any_funcs = true;
+ }
+ else
+ ++unordered_func_count;
+ }
+
if(moved)
+ {
+ if(function_insert_point==i)
+ ++function_insert_point;
block.body.erase(i++);
+ }
else
++i;
+
+ if(i==block.body.end() && unordered_func_count)
+ {
+ if(!ordered_any_funcs)
+ // A subset of the remaining functions forms a recursive loop
+ /* TODO pick a function and move it up, adding any necessary
+ declarations */
+ break;
+
+ i = function_insert_point;
+ unordered_func_count = 0;
+ }
}
}
+void ProgramCompiler::DeclarationReorderer::visit(ProgramSyntax::VariableDeclaration &var)
+{
+ Visitor::visit(var);
+ kind = VARIABLE;
+}
+
+void ProgramCompiler::DeclarationReorderer::visit(FunctionDeclaration &func)
+{
+ needed_funcs.clear();
+ func.body.visit(*this);
+ needed_funcs.erase(&func);
+ kind = FUNCTION;
+}
+
ProgramCompiler::InlineableFunctionLocator::InlineableFunctionLocator():
in_function(0)