Merge pull request #378 from pmienk/master

Generalize obj file name collision detection.

Author: evoskuil

templates/gsl.vcxproj

@@ -102,38 +102,42 @@ endfunction
 ###
 ### generic assistance functions
 ###
-function match_name(element, name)
-    define my.element = match_name.element
-    return defined(my.element) & (my.element.name = my.name)
+function match_element_name(alpha, beta)
+    define my.alpha = match_element_name.alpha
+    define my.beta = match_element_name.beta
+    return defined(my.alpha) & defined(my.beta) & (object_base_from_element(my.alpha) = object_base_from_element(my.beta))
 endfunction
 
-function exists_collision(root, name)
+function exists_collision(root, element)
     define my.root = exists_collision.root
-    return count(my.root.collision, match_name(count, my.name)) > 0
+    define my.element = exists_collision.element
+    return count(my.root.collision, match_element_name(count, my.element)) > 0
 endfunction
 
-function add_collision(root, name)
+function add_collision(root, element)
     define my.root = add_collision.root
-    if (defined(my.root) & !exists_collision(my.root, my.name))
+    define my.element = add_collision.element
+    if (defined(my.root) & !exists_collision(my.root, my.element))
         new my.root.collision as _collision
-            _collision.name = my.name
+            _collision.name = my.element.name
         endnew
     endif
     return my.root
 endfunction
 
-function collides_file_name(root, name)
+function collides_file_name(root, element)
     define my.root = collides_file_name.root
-    return count(my.root.file, match_name(count, my.name)) > 1
+    define my.element = collides_file_name.element
+    return count(my.root.file, match_element_name(count, my.element)) > 1
 endfunction
 
 function populate_collisions(collisions, file_data)
     define my.collisions = populate_collisions.collisions
     define my.file_data = populate_collisions.file_data
 
     for my.file_data.file as _file
-        if (collides_file_name(my.file_data, _file.name))
-            add_collision(my.collisions, _file.name)
+        if (collides_file_name(my.file_data, _file))
+            add_collision(my.collisions, _file)
         endif
     endfor
 endfunction
@@ -798,7 +802,7 @@ endfunction emit_project
 .   define my.collisions = emit_compile_item.collisions
 .   define my.file_record = emit_compile_item.file_record
 .
-.   if (!exists_collision(my.collisions, my.file_record.name))
+.   if (!exists_collision(my.collisions, my.file_record))
 .       emit_file_record_item("ClCompile", my.file_record)
 .   else
 .       emit_item_with_object("ClCompile", my.file_record)