Use insert instead of [] to retain the first item with the same name

[libs/gl.git] / source / glsl / generate.cpp

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 7c619830c1733f43160323172ff19605a69632e4..0a469a46e1dd79b07ad73b82d594e41c11fd5749 100644 (file)
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -295,7 +295,7 @@ void VariableResolver::visit(FunctionCall &call)
 void VariableResolver::visit(StructDeclaration &strct)
 {
        TraversingVisitor::visit(strct);
-       stage->types[strct.name] = &strct;
+       stage->types.insert(make_pair(strct.name, &strct));
 }
 
 void VariableResolver::visit(VariableDeclaration &var)
@@ -308,16 +308,16 @@ void VariableResolver::visit(VariableDeclaration &var)
                var.interface = block_interface;
 
        TraversingVisitor::visit(var);
-       current_block->variables[var.name] = &var;
+       current_block->variables.insert(make_pair(var.name, &var));
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)
 {
        /* Block names can't be used for any other identifiers so we can put them
        in the same map with instance names. */
-       stage->interface_blocks[iface.name] = &iface;
+       stage->interface_blocks.insert(make_pair(iface.name, &iface));
        if(!iface.instance_name.empty())
-               stage->interface_blocks[iface.instance_name] = &iface;
+               stage->interface_blocks.insert(make_pair(iface.instance_name, &iface));
 
        SetForScope<string> set_iface(block_interface, iface.interface);
        TraversingVisitor::visit(iface);
@@ -443,7 +443,7 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
        }
 
        iface_target_block->body.insert(iface_insert_point, iface_var);
-       iface_target_block->variables[name] = iface_var;
+       iface_target_block->variables.insert(make_pair(name, iface_var));
 
        return iface_var;
 }
@@ -472,9 +472,9 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block
        }
 
        iface_target_block->body.insert(iface_insert_point, in_block);
-       stage->interface_blocks[in_block->name] = in_block;
+       stage->interface_blocks.insert(make_pair(in_block->name, in_block));
        if(!in_block->instance_name.empty())
-               stage->interface_blocks[in_block->instance_name] = in_block;
+               stage->interface_blocks.insert(make_pair(in_block->instance_name, in_block));
 
        SetFlag set_scope(function_scope, false);
        SetForScope<Block *> set_block(current_block, &stage->content);
@@ -565,8 +565,11 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
        {
                /* For output variables in function scope, generate a global interface
                and replace the local declaration with an assignment. */
-               if(function_scope && generate_interface(var, "out", var.name))
+               VariableDeclaration *out_var = 0;
+               if(function_scope && (out_var=generate_interface(var, "out", var.name)))
                {
+                       out_var->source = var.source;
+                       out_var->line = var.line;
                        nodes_to_remove.insert(&var);
                        if(var.init_expression)
                        {