Fixed merging bug - Imports are now merged deeply.

merge_struct.m

@@ -4,13 +4,19 @@
 % fields of p and s. If there are equal field names in p and s, fields in p
 % are overwriten with their peers from s.
 %
-function result = merge_struct(p, s, donotmerge)
+function result = merge_struct(p, s, donotmerge, deep)
     if ~( isstruct(p) && isstruct(s) )
         error('Only structures can be merged.');
     end;
     if ~exist('donotmerge','var')
         donotmerge = {};
     end
+    if ~exist('deep','var')
+        deep = 0;
+    elseif strcmp(deep, 'deep')
+        deep = 1;
+    end;
+
     result = p;
     for i = fields(s)'
         fld = char(i);
@@ -26,6 +32,10 @@
         %disp(['fieldname: ',fld]);
         %disp(s.(fld));
         %disp('----------');
-        result.(fld) = s.(fld);
+        if deep == 1 && isfield(result, fld)
+            result.(fld) = merge_struct(result.(fld), s.(fld), donotmerge, deep);
+        else
+            result.(fld) = s.(fld);
+        end;
     end;
 end

mergeimports.m

@@ -85,7 +85,7 @@
         end;
     end;
     for i = 1:length(collected_imports)
-        result = merge_struct(result, collected_imports{i});
+        result = merge_struct(result, collected_imports{i}, {}, 'deep');
     end;
     if any(verb == 1); fprintf([indent,'} struct\n']); end; % for debugging
 end
@@ -101,7 +101,7 @@
         collected_nonstruct = {};
         for i = 1:length(data)
             if isstruct(data{i})
-                merged_structs = merge_struct(merged_structs, data{i});
+                merged_structs = merge_struct(merged_structs, data{i}, {}, 'deep');
             else
                 collected_nonstruct{end+1} = data{i};
             end;