Add description method generation

meric · May 14, 2012 · d869b21 · d869b21
1 parent 5ed3263
commit d869b21
Show file tree

Hide file tree

Showing 13 changed files with 448 additions and 730 deletions.
diff --git a/SVGKit/DOM/Element/SKElement+DOM.h b/SVGKit/DOM/Element/SKElement+DOM.h
@@ -24,16 +24,6 @@
 - (void)removedFromParent;
 - (void)setValue:(NSString *)value forName:(NSString*)name;
 - (NSString*)stringForName:(NSString*)attributeName;
-- (SKLength*)lengthForName:(NSString*)attributeName;
-- (NSArray*)transformArrayForName:(NSString*)attributeName;
-- (NSArray*)lengthArrayForName:(NSString*)attributeName;
-- (SKPreserveAspectRatio*)preserveAspectRatioForName:(NSString*)attributeName;
-- (NSArray*)stringArrayForName:(NSString*)attributeName;
-- (NSArray*)classArrayForName:(NSString*)attributeName;
-- (SKLiteral)literalForName:(NSString*)attributeName;
-- (SKColor*)colorForName:(NSString*)attributeName;
-- (NSNumber*)numberForName:(NSString*)attributeName;
-
 @end
 
 /*
@@ -56,6 +46,7 @@
         call(scanner, &val);\
     }\
     if (val) [_attributes setObject:val forKey:name];\
+    if (!number) SKWarn(@"scanner for %@ attribute not implemented", name);\
 }
 
 #define SKAttribute__set(name)\

diff --git a/SVGKit/DOM/Element/SKElement.m b/SVGKit/DOM/Element/SKElement.m
@@ -111,119 +111,14 @@ - (void)setValue:(NSString *)value forName:(NSString*)name;
     }
 }
 
-// Common attribute types
+// Get string from attribute
 
 - (NSString*)stringForName:(NSString*)attributeName {
     NSXMLNode *node = [_element attributeForName:attributeName];
     if (node) return [node stringValue];
     return nil;
 }
-/*
-- (SKLength*)lengthForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    struct SKQuantity length = SKMakeQuantity(0, SKNumber);
-    if (SKScanLength(scanner, &length))
-        return [SKLength lengthWithQuantity:length];
-    return nil;
-}
-
-- (NSNumber*)numberForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return NULL;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    double number;
-    if (SKScanNumber(scanner, &number)) {
-        return [NSNumber numberWithDouble:number];
-    }
-    return nil;
-}
-
-- (NSArray*)transformArrayForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    NSArray *array = nil;
-    SKScanTransformArray(scanner, &array);
-    return array;
-}
-
-- (NSArray*)lengthArrayForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    NSArray *array = nil;
-    SKScanLengthArray(scanner, &array);
-    return array;
-}
-
-- (SKPreserveAspectRatio*)preserveAspectRatioForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    SKLiteralSet ratio;
-    if (SKScanPreserveAspectRatio(scanner, &ratio)) {
-        return [SKPreserveAspectRatio 
-                preserveAspectRatioWithLiteralSet:ratio];
-    }
-    return nil;
-}
-
-- (NSArray*)stringArrayForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    
-    NSString *wsp = [[NSCharacterSet whitespaceCharacterSet] characters];
-    NSString *sep = [wsp stringByAppendingString:@","];
-    NSCharacterSet *s = [NSCharacterSet characterSetWithCharactersInString:sep];
-    s = [s invertedSet];
-    NSArray *array = nil;
-    SKScanStringArray(scanner, &array, s);
-    return array;
-}
-
-- (NSArray*)classArrayForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    NSArray *array = nil;
-    SKScanStringArray(scanner, &array, [NSCharacterSet letterCharacterSet]);
-    return array;
-}
-
-- (SKLiteral)literalForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return SKUnknownLiteral;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    SKLiteral literal;
-    if (SKScanLiteral(scanner, &literal)) {
-        return literal;
-    }
-    return SKUnknownLiteral;
-}
 
-- (SKColor*)colorForName:(NSString*)attributeName {
-    NSString *string = [self stringForName:attributeName];
-    if (!string) return nil;
-    NSScanner *scanner = [NSScanner scannerWithString:string];
-    [scanner setCharactersToBeSkipped:nil];
-    NSUInteger color;
-    if (SKScanColor(scanner, &color)) {
-        return [SKColor colorWithColor:color];
-    }
-    return [SKColor color];
-}
-*/
 #if 0
 #pragma mark --- SKNode ---
 #endif

diff --git a/SVGKit/DOM/Element/SKRoot.h b/SVGKit/DOM/Element/SKRoot.h
@@ -15,12 +15,6 @@
 @interface SKRoot : SKElement
 {
     SKDocument *_document;
-
-    /*
-    contentScriptType
-    contentStyleType
-    */
-
 }
 
 #if 0
@@ -36,11 +30,7 @@ SKGraphicalEventAttrib__interface();
 SKConditionalProcessingAttrib__interface();
 SKPresentationAttrib__interface();
 
-SKAttribute__property(SKLength, *width);
-SKAttribute__property(SKLength, *height);
-SKAttribute__property(SKLength, *x);
-SKAttribute__property(SKLength, *y);
-
+SKAttribute__property(SKLength, *width, *height, *x, *y);
 //SKAttribute__property(NSString, *version, *baseProfile);
 //SKAttribute__property(NSString, *contentScriptType, *contentStyleType);
 //SKAttribute__property(SKLength, *width, *height, *x, *y);

diff --git a/SVGKit/DOM/SVGKit+Attribute.h b/SVGKit/DOM/SVGKit+Attribute.h
@@ -6,13 +6,15 @@ __attribute__((constructor))
 static void initialize_scannerForAttribute() {
   scannerForAttribute = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
     [NSNumber numberWithUnsignedLong:(size_t)SKScanInnerColor],@"flood-color",
+    [NSNumber numberWithUnsignedLong:(size_t)SKScanDouble],@"flood-opacity",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanColor],@"color",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanStringArray],@"class",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanTransformArray],@"transform",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanLength],@"height",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanLength],@"width",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanLength],@"y",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanLength],@"x",
+    [NSNumber numberWithUnsignedLong:(size_t)SKScanPreserveAspectRatio],@"preserveAspectRatio",
     [NSNumber numberWithUnsignedLong:(size_t)SKScanString],@"id",
     nil];
 }