search ref in simple types (Daij-Djan#14)

anivaros · Dec 28, 2016 · cc8819a · cc8819a
1 parent 4d2b5c6
commit cc8819a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/framework/XSDschema.m b/framework/XSDschema.m
@@ -150,6 +150,7 @@ - (id) initWithNode:(NSXMLElement*)node targetNamespacePrefix:(NSString*)prefix
         /* Add basic simple types known in the built-in types */
         for(XSSimpleType *aSimpleType in [XSSimpleType knownSimpleTypesForSchema:self]) {
             [_knownSimpleTypeDict setValue: aSimpleType forKey: aSimpleType.name];
+            [((NSMutableArray*)self.simpleTypes) addObject:aSimpleType];
         }
 
         /* Add custom simple types */
@@ -184,9 +185,9 @@ - (id) initWithNode:(NSXMLElement*)node targetNamespacePrefix:(NSString*)prefix
         for (XSDelement* anElement in globalElements) {
             id<XSType> aType = [anElement schemaType];
             /* For the type check if it is in our found complex types */
-            if( [aType isMemberOfClass: [XSDcomplexType class]]) {
+//            if( [aType isMemberOfClass: [XSDcomplexType class]]) {
                 ((XSDcomplexType*)aType).globalElements = [((XSDcomplexType*)aType).globalElements arrayByAddingObject: anElement];
-            }
+//            }
         }
 	}
 

diff --git a/framework/XSType.h b/framework/XSType.h
@@ -16,6 +16,7 @@
 - (NSString*) name;
 - (NSString*) baseType;
 - (NSArray*) attributes;
+- (NSArray*) globalElements;
 
 //parsing
 

diff --git a/framework/objects/XSSimpleType.h b/framework/objects/XSSimpleType.h
@@ -24,6 +24,7 @@
 @property (readonly, nonatomic) NSString* readPrefixCode;
 @property (readonly, nonatomic) NSArray* includes;
 @property (strong, nonatomic) NSArray* enumerations;
+@property (readonly, nonatomic) NSArray* globalElements;
 
 - (BOOL)supplyTemplates:(NSXMLElement *)element enumTypeNode:(NSXMLNode*)enumTypeNode error:(NSError *__autoreleasing *)error;
 - (NSDictionary*) substitutionDict;
@@ -46,4 +47,4 @@
 
 @end
 
-extern BOOL gUnitTestingSwiftCode; //swift 2 workaround
+extern BOOL gUnitTestingSwiftCode; //swift 2 workaround
diff --git a/framework/objects/XSSimpleType.m b/framework/objects/XSSimpleType.m
@@ -33,12 +33,22 @@ @interface XSSimpleType ()
 @property (strong, nonatomic) NSString* enumReadValueCode;
 @property (strong, nonatomic) NSString* enumReadPrefixCode;
 
+@property (strong, nonatomic) NSArray* globalElements;
+
 @end
 
 @implementation XSSimpleType {
     MGTemplateEngine *engine;
 }
 
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+         _globalElements = [NSMutableArray array];
+    }
+    return self;
+}
+
 - (id) initWithNode:(NSXMLElement*)node schema:(XSDschema*)schema {
     self = [super initWithNode:node schema:schema];
     /* Continute to add items to the extended XSSchemaNode class */
@@ -381,4 +391,4 @@ + (NSArray *)knownSimpleTypesForSchema:(XSDschema*)schema {
 
 @end
 
-BOOL gUnitTestingSwiftCode = NO; //swift 2 workaround
+BOOL gUnitTestingSwiftCode = NO; //swift 2 workaround