Merge branch 'add-mixin-for-type-with-group-properties' into update-tutorials-with-dot-syntax-for-sets

Author: ehennestad

+file/Attribute.m

@@ -11,6 +11,7 @@
         scalar; %if the value is scalar or an array
         dimnames;
         shape;
+        isConstrainedSet;
     end
 
     methods
@@ -27,6 +28,8 @@
             obj.scalar = true;
             obj.shape = {};
             obj.dimnames = {};
+            obj.isConstrainedSet = false; % Always false for attributes
+
 
             if nargin < 1
                 return;

+file/Dataset.m

@@ -150,7 +150,15 @@
                 );
 
             if ~isempty(obj.dtype)
-                props('data') = obj.dtype;
+                % Add a value to the props map representing the dataset
+                % itself. The prop name of a dataset class is always data,
+                % the type should be empty, and we add a custom doc.
+                objCopy = obj;
+                objCopy.name = 'data';
+                objCopy.isConstrainedSet = false;
+                objCopy.type = ''; % Reset type, as this now represents a property
+                objCopy.doc = sprintf('Data property for dataset class (%s)', obj.type);
+                props('data') = objCopy;
             end
 
             if ~isempty(obj.attributes)

+file/Link.m

@@ -4,6 +4,8 @@
         name;
         required;
         type;
+        scalar;
+        isConstrainedSet
     end
 
     methods
@@ -12,14 +14,25 @@
             obj.name = [];
             obj.required = true;
             obj.type = [];
+            obj.scalar = true;
+            obj.isConstrainedSet = false;
+
             if nargin < 1
                 return;
             end
+
+            % If the name is missing, we use the target type for the name
+            if isKey(source, 'name')
+                obj.name = source('name');
+            else
+                obj.name = lower(source('target_type'));
+                obj.isConstrainedSet = true;
+            end
 
             obj.doc = source('doc');
-            obj.name = source('name');
             obj.type = source('target_type');
             obj.required = obj.isRequired(source);
+            obj.scalar = obj.isScalar(source);
         end
     end
-end
+end

+file/fillConstructor.m

@@ -61,18 +61,22 @@
     dynamicConstrained = false(size(names));
     isAnonymousType = false(size(names));
     isAttribute = false(size(names));
+    isLink = false(size(names));
+
     typenames = repmat({''}, size(names));
-    varnames = repmat({''}, size(names));
+    varnames = repmat({''}, size(names)); % necessary? same as names?
     for i = 1:length(names)
         nm = names{i};
         prop = props(nm);
 
         if isa(prop, 'file.Attribute')
             isAttribute(i) = true;
-            continue;
+            continue
+        elseif isa(prop, 'file.Link')
+            isLink(i) = true;
         end
 
-        if isa(prop, 'file.interface.HasProps')
+        if isa(prop, 'file.interface.HasProps') || isa(prop, 'file.Link')
             isDynamicConstrained = false(size(prop));
             isAnon = false(size(prop));
             hasType = false(size(prop));
@@ -118,12 +122,32 @@
     end
     varnames = lower(varnames);
 
-    %we delete the entry in varargin such that any conflicts do not show up in inputParser
+    % We delete parsed elements from varargin such that any conflicts do not 
+    % show up in inputParser
     deleteFromVars = 'varargin(ivarargin) = [];';
+
+    % Add parsing logic for dynamic constrained links.
+    % A dynamic constrained link is a subset of dynamic constrained types.
+    % Their type names are prefixed with 'Link:' to mark them for link-specific 
+    % validation during parsing.
+    isDynamicConstrainedLink = dynamicConstrained & isLink;
+    if any(isDynamicConstrainedLink)
+        constrainedLinkTypes = strcat('Link:', typenames(isDynamicConstrainedLink & ~invalid));
+        constrainedLinkVars = varnames(isDynamicConstrainedLink & ~invalid);
+        methodCalls = strcat('[obj.', constrainedLinkVars, ', ivarargin] = ',...
+            ' types.util.parseConstrained(obj, ''', constrainedLinkVars, ''', ''',...
+            constrainedLinkTypes, ''', varargin{:});');
+        fullBody = cell(length(methodCalls) * 2,1);
+        fullBody(1:2:end) = methodCalls;
+        fullBody(2:2:end) = {deleteFromVars};
+        fullBody = strjoin(fullBody, newline);
+        bodystr(end+1:end+length(fullBody)+1) = [newline fullBody];
+    end
+
     %if constrained/anon sets exist, then check for nonstandard parameters and add as
     %container.map
-    constrainedTypes = typenames(dynamicConstrained & ~invalid);
-    constrainedVars = varnames(dynamicConstrained & ~invalid);
+    constrainedTypes = typenames(dynamicConstrained & ~isLink & ~invalid);
+    constrainedVars = varnames(dynamicConstrained & ~isLink & ~invalid);
     methodCalls = strcat('[obj.', constrainedVars, ', ivarargin] = ',...
         ' types.util.parseConstrained(obj,''', constrainedVars, ''', ''',...
         constrainedTypes, ''', varargin{:});');
@@ -135,7 +159,6 @@
 
     %if anonymous values exist, then check for nonstandard parameters and add
     %as Anon
-
     anonTypes = typenames(isAnonymousType & ~invalid);
     anonVars = varnames(isAnonymousType & ~invalid);
     methodCalls = strcat('[obj.', anonVars, ',ivarargin] = ',...

+file/fillExport.m

@@ -171,14 +171,14 @@
         elisionpath = ['[fullpath ''/' elisions ''']'];
     end
 
-    if (isa(prop, 'file.Group') || isa(prop, 'file.Dataset')) && prop.isConstrainedSet
+    if isprop(prop, 'isConstrainedSet') && prop.isConstrainedSet
         % is a sub-object (with an export function)
         dataExportString = ['refs = obj.' name '.export(fid, ' elisionpath ', refs);'];
     elseif isa(prop, 'file.Link') || isa(prop, 'file.Group') ||...
             (isa(prop, 'file.Dataset') && ~isempty(prop.type))
         % obj, loc_id, path, refs
         dataExportString = ['refs = obj.' name '.export(fid, ' fullpath ', refs);'];
-    elseif isa(prop, 'file.Dataset') %untyped dataset
+    elseif isa(prop, 'file.Dataset') % untyped dataset
         options = {};
 
         % special case due to unique behavior of file_create_date
@@ -210,7 +210,7 @@
             [sprintf('    %s(fid, %s, %s);', writerStr, fullpath, nameArgs)]...
             'end'...
             }, newline);
-    else
+    else % Attribute
         if prop.scalar
             forceArrayFlag = '';
         else