VariableResolver::VariableResolver():
stage(0),
- builtins(0),
- members(0),
+ r_members(0),
record_target(false),
- assignment_target(0),
- self_referencing(false)
+ r_assignment_target(0),
+ r_self_referencing(false)
{ }
void VariableResolver::apply(Stage &s)
stage = &s;
s.types.clear();
s.interface_blocks.clear();
- Stage *builtin_stage = get_builtins(s.type);
- builtins = (builtin_stage ? &builtin_stage->content : 0);
s.content.visit(*this);
}
-Block *VariableResolver::next_block(Block &block)
-{
- return block.parent ? block.parent : &block!=builtins ? builtins : 0;
-}
-
void VariableResolver::enter(Block &block)
{
block.variables.clear();
void VariableResolver::visit(VariableReference &var)
{
var.declaration = 0;
- members = 0;
- for(Block *block=current_block; (!var.declaration && block); block=next_block(*block))
+ r_members = 0;
+ for(Block *block=current_block; (!var.declaration && block); block=block->parent)
{
map<string, VariableDeclaration *>::iterator i = block->variables.find(var.name);
if(i!=block->variables.end())
if(var.declaration)
{
if(var.declaration->type_declaration)
- members = &var.declaration->type_declaration->members.variables;
+ r_members = &var.declaration->type_declaration->members.variables;
}
else
{
map<string, InterfaceBlock *>::const_iterator i = blocks.find(var.name);
if(i!=blocks.end() && i->second->instance_name==var.name)
{
- iface_ref = new InterfaceBlockReference;
- iface_ref->name = var.name;
- iface_ref->declaration = i->second;
- members = &i->second->members.variables;
+ r_iface_ref = new InterfaceBlockReference;
+ r_iface_ref->name = var.name;
+ r_iface_ref->declaration = i->second;
+ r_members = &i->second->members.variables;
}
else
{
if(record_target)
{
- if(assignment_target)
+ if(r_assignment_target)
{
record_target = false;
- assignment_target = 0;
+ r_assignment_target = 0;
}
else
- assignment_target = var.declaration;
+ r_assignment_target = var.declaration;
}
- else if(var.declaration && var.declaration==assignment_target)
- self_referencing = true;
+ else if(var.declaration && var.declaration==r_assignment_target)
+ r_self_referencing = true;
}
void VariableResolver::visit(InterfaceBlockReference &iface)
{
iface.declaration = 0;
- for(Block *block=current_block; block; block=next_block(*block))
+ for(Block *block=current_block; block; block=block->parent)
{
map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find(iface.name);
if(i!=stage->interface_blocks.end())
{
iface.declaration = i->second;
- members = &i->second->members.variables;
+ r_members = &i->second->members.variables;
break;
}
}
void VariableResolver::visit(MemberAccess &memacc)
{
- members = 0;
- iface_ref = 0;
+ r_members = 0;
+ r_iface_ref = 0;
memacc.left->visit(*this);
- if(iface_ref)
- memacc.left = iface_ref;
- iface_ref = 0;
+ if(r_iface_ref)
+ memacc.left = r_iface_ref;
+ r_iface_ref = 0;
memacc.declaration = 0;
- if(members)
+ if(r_members)
{
- map<string, VariableDeclaration *>::iterator i = members->find(memacc.member);
- if(i!=members->end())
+ map<string, VariableDeclaration *>::iterator i = r_members->find(memacc.member);
+ if(i!=r_members->end())
{
memacc.declaration = i->second;
if(i->second->type_declaration)
- members = &i->second->type_declaration->members.variables;
+ r_members = &i->second->type_declaration->members.variables;
}
else
- members = 0;
+ r_members = 0;
}
}
void VariableResolver::visit(BinaryExpression &binary)
{
- if(binary.oper=="[")
+ if(binary.oper->token[0]=='[')
{
{
SetForScope<bool> set(record_target, false);
binary.right->visit(*this);
}
- members = 0;
- iface_ref = 0;
+ r_members = 0;
+ r_iface_ref = 0;
binary.left->visit(*this);
- if(iface_ref)
- binary.left = iface_ref;
- iface_ref = 0;
+ if(r_iface_ref)
+ binary.left = r_iface_ref;
+ r_iface_ref = 0;
}
else
{
TraversingVisitor::visit(binary);
- members = 0;
+ r_members = 0;
}
}
{
{
SetFlag set(record_target);
- assignment_target = 0;
+ r_assignment_target = 0;
assign.left->visit(*this);
}
- self_referencing = false;
+ r_self_referencing = false;
assign.right->visit(*this);
- assign.self_referencing = (self_referencing || assign.oper!="=");
- assign.target_declaration = assignment_target;
+ assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
+ assign.target_declaration = r_assignment_target;
}
void VariableResolver::visit(StructDeclaration &strct)
}
else
{
+ func.definition = 0;
if(!stage_decl)
stage_decl = &func;
-
- func.definition = stage_decl->definition;
+ else
+ func.definition = stage_decl->definition;
}
decls.push_back(&func);
VariableReference *ref = new VariableReference;
ref->name = left;
assign->left = ref;
- assign->oper = "=";
+ assign->oper = &Operator::get_operator("=", Operator::BINARY);
assign->right = right;
ExpressionStatement *stmt = new ExpressionStatement;
BinaryExpression *subscript = new BinaryExpression;
subscript->left = ref;
- subscript->oper = "[";
+ subscript->oper = &Operator::get_operator("[", Operator::BINARY);
subscript->right = pass.subscript;
- subscript->after = "]";
MemberAccess *memacc = new MemberAccess;
memacc->left = subscript;
{
BinaryExpression *subscript = new BinaryExpression;
subscript->left = ref;
- subscript->oper = "[";
+ subscript->oper = &Operator::get_operator("[", Operator::BINARY);
subscript->right = pass.subscript;
- subscript->after = "]";
insert_assignment(out_name, subscript);
}
else
nodes_to_remove.insert(&pass);
}
-
-DeclarationReorderer::DeclarationReorderer():
- kind(NO_DECLARATION)
-{ }
-
-void DeclarationReorderer::visit(FunctionCall &call)
-{
- FunctionDeclaration *def = call.declaration;
- if(def)
- def = def->definition;
- if(def && !ordered_funcs.count(def))
- needed_funcs.insert(def);
-}
-
-void DeclarationReorderer::visit(Block &block)
-{
- if(block.parent)
- return TraversingVisitor::visit(block);
-
- NodeList<Statement>::iterator struct_insert_point = block.body.end();
- NodeList<Statement>::iterator variable_insert_point = block.body.end();
- NodeList<Statement>::iterator function_insert_point = block.body.end();
- unsigned unordered_func_count = 0;
- bool ordered_any_funcs = false;
-
- for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); )
- {
- kind = NO_DECLARATION;
- (*i)->visit(*this);
-
- bool moved = false;
- if(kind==STRUCT && struct_insert_point!=block.body.end())
- {
- block.body.insert(struct_insert_point, *i);
- moved = true;
- }
- else if(kind>STRUCT && struct_insert_point==block.body.end())
- struct_insert_point = i;
-
- if(kind==VARIABLE && variable_insert_point!=block.body.end())
- {
- block.body.insert(variable_insert_point, *i);
- moved = true;
- }
- 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 DeclarationReorderer::visit(VariableDeclaration &var)
-{
- TraversingVisitor::visit(var);
- kind = VARIABLE;
-}
-
-void DeclarationReorderer::visit(FunctionDeclaration &func)
-{
- needed_funcs.clear();
- func.body.visit(*this);
- needed_funcs.erase(&func);
- kind = FUNCTION;
-}
-
} // namespace SL
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff