Permalink
Browse files

Add range support to properties.

  • Loading branch information...
1 parent 5ddb298 commit 51b49e486e14ccb19d2353f7b9fc29d0821260ba @uliwitness committed Jun 4, 2012
2 Forge
@@ -1 +1 @@
-Subproject commit fd6a19ed3b257f6949d3e5a94b384fbd30ea4c6e
+Subproject commit 99b7d5ee994e9cc3a31a5880173cce234b4a8f19
2 Leonie
@@ -1 +1 @@
-Subproject commit d76eae2bccf640a6485c70dd13b32085fe907502
+Subproject commit 3efbe5a5277eab27710cafb6868069534cc95d1e
View
15 Stacksmith/Instructions/ForgeObjCConversion.h
@@ -0,0 +1,15 @@
+//
+// ForgeObjCConversion.h
+// Stacksmith
+//
+// Created by Uli Kusterer on 04.06.12.
+// Copyright (c) 2012 Uli Kusterer. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#include "LEOValue.h"
+#include "LEOInterpreter.h"
+
+
+id WILDObjCObjectFromLEOValue( LEOValuePtr inValue, LEOContext* inContext );
+BOOL WILDObjCObjectToLEOValue( id inValue, LEOValuePtr outValue, LEOContext* inContext );
View
105 Stacksmith/Instructions/ForgeObjCConversion.m
@@ -0,0 +1,105 @@
+//
+// ForgeObjCConversion.m
+// Stacksmith
+//
+// Created by Uli Kusterer on 04.06.12.
+// Copyright (c) 2012 Uli Kusterer. All rights reserved.
+//
+
+#import "ForgeObjCConversion.h"
+
+
+void AppendLEOArrayToDictionary( struct LEOArrayEntry * inEntry, NSMutableDictionary* dict, LEOContext *inContext )
+{
+ if( inEntry )
+ {
+ NSString * theKey = [NSString stringWithUTF8String: inEntry->key];
+ char strBuf[1024] = { 0 };
+ NSString * theValue = [NSString stringWithUTF8String: LEOGetValueAsString( &inEntry->value, strBuf, sizeof(strBuf), inContext )];
+ [dict setObject: theValue forKey: theKey]; // TODO: Don't always convert to string.
+
+ if( inEntry->smallerItem )
+ AppendLEOArrayToDictionary( inEntry->smallerItem, dict, inContext );
+ if( inEntry->largerItem )
+ AppendLEOArrayToDictionary( inEntry->largerItem, dict, inContext );
+ }
+}
+
+
+id WILDObjCObjectFromLEOValue( LEOValuePtr inValue, LEOContext* inContext )
+{
+ id theObjCValue = nil;
+ LEOValuePtr theArrayValue = LEOFollowReferencesAndReturnValueOfType( inValue, &kLeoValueTypeArray, inContext );
+ if( !theArrayValue )
+ theArrayValue = LEOFollowReferencesAndReturnValueOfType( inValue, &kLeoValueTypeArrayVariant, inContext );
+ if( theArrayValue )
+ {
+ theObjCValue = [NSMutableDictionary dictionary];
+ AppendLEOArrayToDictionary( theArrayValue->array.array, theObjCValue, inContext );
+ }
+ else
+ {
+ char theValueStrBuf[1024] = { 0 };
+ char* theValueStr = LEOGetValueAsString( inValue, theValueStrBuf, sizeof(theValueStrBuf), inContext );
+ theObjCValue = [NSString stringWithUTF8String: theValueStr];
+ }
+
+ return theObjCValue;
+}
+
+
+BOOL WILDObjCObjectToLEOValue( id inValue, LEOValuePtr outValue, LEOContext* inContext )
+{
+ if( inValue == kCFBooleanTrue || inValue == kCFBooleanFalse )
+ {
+ LEOInitBooleanValue( outValue, (inValue == kCFBooleanTrue), kLEOInvalidateReferences, inContext );
+ }
+ else if( [inValue isKindOfClass: [NSString class]] )
+ {
+ const char* valueStr = [inValue UTF8String];
+ LEOInitStringValue( outValue, valueStr, strlen(valueStr), kLEOInvalidateReferences, inContext );
+ }
+ else if( [inValue isKindOfClass: [NSNumber class]] )
+ {
+ if( strcmp([inValue objCType], @encode(long long)) == 0
+ || strcmp([inValue objCType], @encode(NSInteger)) == 0
+ || strcmp([inValue objCType], @encode(int)) == 0
+ || strcmp([inValue objCType], @encode(short)) == 0
+ || strcmp([inValue objCType], @encode(char)) == 0 )
+ {
+ LEOInitIntegerValue( outValue, [inValue longLongValue], kLEOInvalidateReferences, inContext );
+ }
+ else
+ {
+ LEOInitNumberValue( outValue, [inValue doubleValue], kLEOInvalidateReferences, inContext );
+ }
+ }
+ else if( [inValue isKindOfClass: [NSDictionary class]] )
+ {
+ NSDictionary * theDict = inValue;
+ struct LEOArrayEntry* theArray = NULL;
+
+ for( NSString* dictKey in theDict )
+ {
+ id dictValue = [theDict objectForKey: dictKey];
+ union LEOValue dictValueCopy;
+ if( [dictValue isKindOfClass: [NSString class]] )
+ {
+ const char* valueStr = [dictValue UTF8String];
+ LEOInitStringValue( &dictValueCopy, valueStr, strlen(valueStr), kLEOInvalidateReferences, inContext );
+ }
+ else if( [dictValue isKindOfClass: [NSNumber class]] )
+ {
+ LEOInitNumberValue( &dictValueCopy, [dictValue doubleValue], kLEOInvalidateReferences, inContext );
+ }
+ LEOAddArrayEntryToRoot( &theArray, [dictKey UTF8String], &dictValueCopy, inContext );
+
+ LEOCleanUpValue( &dictValueCopy, kLEOInvalidateReferences, inContext );
+ }
+ LEOInitArrayValue( outValue, theArray, kLEOInvalidateReferences, inContext );
+ }
+ else
+ return NO;
+
+ return YES;
+}
View
91 Stacksmith/Instructions/ForgePropertyInstructionsStacksmith.m
@@ -9,7 +9,8 @@
#import "Forge.h"
#import "ForgeWILDObjectValue.h"
-#import <Foundation/Foundation.h>
+#import "ForgeObjCConversion.h"
+
void LEOPushPropertyOfObjectInstruction( LEOContext* inContext )
{
@@ -22,62 +23,15 @@ void LEOPushPropertyOfObjectInstruction( LEOContext* inContext )
LEOValuePtr objectValue = LEOFollowReferencesAndReturnValueOfType( theObject, &kLeoValueTypeWILDObject, inContext );
if( objectValue )
{
- id propValueObj = [(id<WILDObject>)objectValue->object.object valueForWILDPropertyNamed: [NSString stringWithUTF8String: propNameStr]];
+ id propValueObj = [(id<WILDObject>)objectValue->object.object valueForWILDPropertyNamed: [NSString stringWithUTF8String: propNameStr] ofRange: NSMakeRange(0,0)];
if( !propValueObj )
{
LEOContextStopWithError( inContext,"Object does not have property \"%s\".", propNameStr );
return;
}
LEOCleanUpValue( thePropertyName, kLEOInvalidateReferences, inContext );
- if( propValueObj == kCFBooleanTrue || propValueObj == kCFBooleanFalse )
- {
- LEOInitBooleanValue( thePropertyName, (propValueObj == kCFBooleanTrue), kLEOInvalidateReferences, inContext );
- }
- else if( [propValueObj isKindOfClass: [NSString class]] )
- {
- const char* valueStr = [propValueObj UTF8String];
- LEOInitStringValue( thePropertyName, valueStr, strlen(valueStr), kLEOInvalidateReferences, inContext );
- }
- else if( [propValueObj isKindOfClass: [NSNumber class]] )
- {
- if( strcmp([propValueObj objCType], @encode(long long)) == 0
- || strcmp([propValueObj objCType], @encode(NSInteger)) == 0
- || strcmp([propValueObj objCType], @encode(int)) == 0
- || strcmp([propValueObj objCType], @encode(short)) == 0
- || strcmp([propValueObj objCType], @encode(char)) == 0 )
- {
- LEOInitIntegerValue( thePropertyName, [propValueObj longLongValue], kLEOInvalidateReferences, inContext );
- }
- else
- {
- LEOInitNumberValue( thePropertyName, [propValueObj doubleValue], kLEOInvalidateReferences, inContext );
- }
- }
- else if( [propValueObj isKindOfClass: [NSDictionary class]] )
- {
- NSDictionary * theDict = propValueObj;
- struct LEOArrayEntry* theArray = NULL;
-
- for( NSString* dictKey in theDict )
- {
- id dictValue = [theDict objectForKey: dictKey];
- union LEOValue dictValueCopy;
- if( [dictValue isKindOfClass: [NSString class]] )
- {
- const char* valueStr = [dictValue UTF8String];
- LEOInitStringValue( &dictValueCopy, valueStr, strlen(valueStr), kLEOInvalidateReferences, inContext );
- }
- else if( [dictValue isKindOfClass: [NSNumber class]] )
- {
- LEOInitNumberValue( &dictValueCopy, [dictValue doubleValue], kLEOInvalidateReferences, inContext );
- }
- LEOAddArrayEntryToRoot( &theArray, [dictKey UTF8String], &dictValueCopy, inContext );
-
- LEOCleanUpValue( &dictValueCopy, kLEOInvalidateReferences, inContext );
- }
- LEOInitArrayValue( thePropertyName, theArray, kLEOInvalidateReferences, inContext );
- }
- else
+
+ if( !WILDObjCObjectToLEOValue( propValueObj, thePropertyName, inContext ) )
{
LEOContextStopWithError( inContext, "Internal Error: property '%s' returned unknown value.", propNameStr );
return;
@@ -104,23 +58,6 @@ void LEOPushPropertyOfObjectInstruction( LEOContext* inContext )
}
-void AppendLEOArrayToDictionary( struct LEOArrayEntry * inEntry, NSMutableDictionary* dict, LEOContext *inContext )
-{
- if( inEntry )
- {
- NSString * theKey = [NSString stringWithUTF8String: inEntry->key];
- char strBuf[1024] = { 0 };
- NSString * theValue = [NSString stringWithUTF8String: LEOGetValueAsString( &inEntry->value, strBuf, sizeof(strBuf), inContext )];
- [dict setObject: theValue forKey: theKey]; // TODO: Don't always convert to string.
-
- if( inEntry->smallerItem )
- AppendLEOArrayToDictionary( inEntry->smallerItem, dict, inContext );
- if( inEntry->largerItem )
- AppendLEOArrayToDictionary( inEntry->largerItem, dict, inContext );
- }
-}
-
-
void LEOSetPropertyOfObjectInstruction( LEOContext* inContext )
{
LEOValuePtr theValue = inContext->stackEndPtr -1;
@@ -134,25 +71,11 @@ void LEOSetPropertyOfObjectInstruction( LEOContext* inContext )
if( theObjectValue )
{
- id theObjCValue = nil;
- LEOValuePtr theArrayValue = LEOFollowReferencesAndReturnValueOfType( theValue, &kLeoValueTypeArray, inContext );
- if( !theArrayValue )
- theArrayValue = LEOFollowReferencesAndReturnValueOfType( theValue, &kLeoValueTypeArrayVariant, inContext );
- if( theArrayValue )
- {
- theObjCValue = [NSMutableDictionary dictionary];
- AppendLEOArrayToDictionary( theArrayValue->array.array, theObjCValue, inContext );
- }
- else
- {
- char theValueStrBuf[1024] = { 0 };
- char* theValueStr = LEOGetValueAsString( theValue, theValueStrBuf, sizeof(theValueStrBuf), inContext );
- theObjCValue = [NSString stringWithUTF8String: theValueStr];
- }
+ id theObjCValue = WILDObjCObjectFromLEOValue( theValue, inContext );
@try
{
- if( ![(id<WILDObject>)theObjectValue->object.object setValue: theObjCValue forWILDPropertyNamed: [NSString stringWithUTF8String: propNameStr]] )
+ if( ![(id<WILDObject>)theObjectValue->object.object setValue: theObjCValue forWILDPropertyNamed: [NSString stringWithUTF8String: propNameStr] inRange: NSMakeRange(0,0)] )
{
LEOContextStopWithError( inContext, "Object does not have property \"%s\".", propNameStr );
return;
View
4 Stacksmith/Instructions/ForgeWILDObjectValue.h
@@ -25,8 +25,8 @@ extern struct LEOValueType kLeoValueTypeWILDObject;
-(BOOL) goThereInNewWindow: (BOOL)inNewWindow;
--(id) valueForWILDPropertyNamed: (NSString*)inPropertyName;
--(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName;
+-(id) valueForWILDPropertyNamed: (NSString*)inPropertyName ofRange: (NSRange)byteRange;
+-(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName inRange: (NSRange)byteRange;
-(struct LEOScript*) scriptObjectShowingErrorMessage: (BOOL)showError;
-(id<WILDObject>) parentObject;
View
32 Stacksmith/Instructions/ForgeWILDObjectValue.m
@@ -10,6 +10,7 @@
#include "LEOInterpreter.h"
#include "LEOContextGroup.h"
#include "LEOScript.h"
+#import "ForgeObjCConversion.h"
LEONumber LEOGetWILDObjectValueAsNumber( LEOValuePtr self, struct LEOContext* inContext );
@@ -41,6 +42,9 @@ void LEODetermineChunkRangeOfSubstringOfWILDObjectValue( LEOValuePtr self, size_
size_t *ioBytesDelStart, size_t *ioBytesDelEnd,
LEOChunkType inType, size_t inRangeStart, size_t inRangeEnd,
struct LEOContext* inContext );
+void LEOGetWILDObjectValueForKeyOfRange( LEOValuePtr self, const char* keyName, size_t startOffset, size_t endOffset, LEOValuePtr outValue, struct LEOContext* inContext );
+void LEOSetWILDObjectValueForKeyOfRange( LEOValuePtr self, const char* keyName, LEOValuePtr inValue, size_t startOffset, size_t endOffset, struct LEOContext* inContext );
+
void LEOCleanUpWILDObjectValue( LEOValuePtr self, LEOKeepReferencesFlag keepReferences, struct LEOContext* inContext );
@@ -81,7 +85,10 @@ void LEODetermineChunkRangeOfSubstringOfWILDObjectValue( LEOValuePtr self, size_
LEOGetWILDObjectValueForKey,
LEOCantSetValueForKey,
LEOSetStringLikeValueAsArray,
- LEOGetWILDObjectKeyCount
+ LEOGetWILDObjectKeyCount,
+
+ LEOGetWILDObjectValueForKeyOfRange,
+ LEOSetWILDObjectValueForKeyOfRange,
};
@@ -418,6 +425,29 @@ size_t LEOGetWILDObjectKeyCount( LEOValuePtr self, struct LEOContext* inContext
}
+void LEOGetWILDObjectValueForKeyOfRange( LEOValuePtr self, const char* keyName, size_t startOffset, size_t endOffset, LEOValuePtr outValue, struct LEOContext* inContext )
+{
+ id<WILDObject> theObject = (id<WILDObject>) self->object.object;
+
+ id returnValue = [theObject valueForWILDPropertyNamed: [NSString stringWithUTF8String: keyName] ofRange: NSMakeRange(startOffset, endOffset)]; // TODO: Need to convert the range into character index, is a UTF8 byte index ATM.
+
+ if( returnValue == NULL )
+ LEOContextStopWithError( inContext, "No property \"%s\".", keyName );
+ else
+ WILDObjCObjectToLEOValue( returnValue, outValue, inContext );
+}
+
+
+void LEOSetWILDObjectValueForKeyOfRange( LEOValuePtr self, const char* keyName, LEOValuePtr inValue, size_t startOffset, size_t endOffset, struct LEOContext* inContext )
+{
+ id<WILDObject> theObject = (id<WILDObject>) self->object.object;
+ id sourceValue = WILDObjCObjectFromLEOValue( inValue, inContext );
+
+ if( ![theObject setValue: sourceValue forWILDPropertyNamed: [NSString stringWithUTF8String: keyName] inRange: NSMakeRange(startOffset, endOffset)] ) // TODO: Need to convert the range into character index, is a UTF8 byte index ATM.
+ LEOContextStopWithError( inContext, "No property \"%s\".", keyName );;
+}
+
+
struct LEOScript* LEOForgeScriptGetParentScript( struct LEOScript* inScript, struct LEOContext* inContext )
{
struct LEOScript* theScript = NULL;
View
18 Stacksmith/Stacksmith.xcodeproj/project.pbxproj
@@ -171,6 +171,9 @@
553C47141357779C000219FA /* ForgeMsgInstructionsStacksmith.m in Sources */ = {isa = PBXBuildFile; fileRef = 553C47131357779C000219FA /* ForgeMsgInstructionsStacksmith.m */; };
553C471713577989000219FA /* WILDMessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 553C471613577989000219FA /* WILDMessageBox.m */; };
553C471A13577A2E000219FA /* WILDMessageBox.xib in Resources */ = {isa = PBXBuildFile; fileRef = 553C471813577A2E000219FA /* WILDMessageBox.xib */; };
+ 553F6809157D138B009E0517 /* ForgeObjCConversion.m in Sources */ = {isa = PBXBuildFile; fileRef = 553F6808157D138B009E0517 /* ForgeObjCConversion.m */; };
+ 553F680C157D3292009E0517 /* CSetChunkPropertyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 553F680A157D3291009E0517 /* CSetChunkPropertyNode.cpp */; };
+ 553F680F157D3547009E0517 /* CGetChunkPropertyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 553F680D157D3547009E0517 /* CGetChunkPropertyNode.cpp */; };
5542C9471139D7A000555C64 /* WILDStack.m in Sources */ = {isa = PBXBuildFile; fileRef = 5542C9461139D7A000555C64 /* WILDStack.m */; };
5542C94D1139DD5C00555C64 /* WILDXMLUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5542C94C1139DD5C00555C64 /* WILDXMLUtils.m */; };
5542C9B71139F43C00555C64 /* WILDCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 5542C9B61139F43C00555C64 /* WILDCard.m */; };
@@ -680,6 +683,12 @@
553C471513577989000219FA /* WILDMessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WILDMessageBox.h; path = Editor/WILDMessageBox.h; sourceTree = "<group>"; };
553C471613577989000219FA /* WILDMessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WILDMessageBox.m; path = Editor/WILDMessageBox.m; sourceTree = "<group>"; };
553C471913577A2E000219FA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/WILDMessageBox.xib; sourceTree = "<group>"; };
+ 553F6807157D138B009E0517 /* ForgeObjCConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ForgeObjCConversion.h; path = Instructions/ForgeObjCConversion.h; sourceTree = SOURCE_ROOT; };
+ 553F6808157D138B009E0517 /* ForgeObjCConversion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ForgeObjCConversion.m; path = Instructions/ForgeObjCConversion.m; sourceTree = SOURCE_ROOT; };
+ 553F680A157D3291009E0517 /* CSetChunkPropertyNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSetChunkPropertyNode.cpp; path = ../../CSetChunkPropertyNode.cpp; sourceTree = "<group>"; };
+ 553F680B157D3291009E0517 /* CSetChunkPropertyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSetChunkPropertyNode.h; path = ../../CSetChunkPropertyNode.h; sourceTree = "<group>"; };
+ 553F680D157D3547009E0517 /* CGetChunkPropertyNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CGetChunkPropertyNode.cpp; path = ../../CGetChunkPropertyNode.cpp; sourceTree = "<group>"; };
+ 553F680E157D3547009E0517 /* CGetChunkPropertyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGetChunkPropertyNode.h; path = ../../CGetChunkPropertyNode.h; sourceTree = "<group>"; };
5542C9451139D7A000555C64 /* WILDStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WILDStack.h; sourceTree = "<group>"; };
5542C9461139D7A000555C64 /* WILDStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WILDStack.m; sourceTree = "<group>"; };
5542C94B1139DD5C00555C64 /* WILDXMLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WILDXMLUtils.h; sourceTree = "<group>"; };
@@ -1180,6 +1189,8 @@
55686662135A161100C364D6 /* ForgeHostFunctionsStacksmith.m */,
55686665135A383700C364D6 /* ForgeWILDObjectValue.h */,
55686664135A383300C364D6 /* ForgeWILDObjectValue.m */,
+ 553F6807157D138B009E0517 /* ForgeObjCConversion.h */,
+ 553F6808157D138B009E0517 /* ForgeObjCConversion.m */,
);
name = Interpreter;
path = ../Forge/ForgeFramework/ForgeFramework;
@@ -1264,6 +1275,10 @@
553C46D013577334000219FA /* CMakeChunkRefNode.cpp */,
553C46D113577334000219FA /* CMakeChunkConstNode.h */,
553C46D213577334000219FA /* CMakeChunkConstNode.cpp */,
+ 553F680B157D3291009E0517 /* CSetChunkPropertyNode.h */,
+ 553F680A157D3291009E0517 /* CSetChunkPropertyNode.cpp */,
+ 553F680E157D3547009E0517 /* CGetChunkPropertyNode.h */,
+ 553F680D157D3547009E0517 /* CGetChunkPropertyNode.cpp */,
55E805C01360A7B3006F1287 /* CObjectPropertyNode.h */,
55E805BF1360A7B3006F1287 /* CObjectPropertyNode.cpp */,
55E805F81366091F006F1287 /* CGlobalPropertyNode.h */,
@@ -2092,6 +2107,9 @@
55B296BF146DE5D6009E60CB /* WILDCheckboxRadioPresenter.m in Sources */,
55D7AA4715715D0E00F33E78 /* CNodeTransformation.cpp in Sources */,
55D7AA4B1573814A00F33E78 /* CChunkPropertyNodeTransformation.cpp in Sources */,
+ 553F6809157D138B009E0517 /* ForgeObjCConversion.m in Sources */,
+ 553F680C157D3292009E0517 /* CSetChunkPropertyNode.cpp in Sources */,
+ 553F680F157D3547009E0517 /* CGetChunkPropertyNode.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
4 Stacksmith/WILDBackground.m
@@ -93,7 +93,7 @@ -(BOOL) goThereInNewWindow: (BOOL)inNewWindow
}
--(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
+-(id) valueForWILDPropertyNamed: (NSString*)inPropertyName ofRange: (NSRange)byteRange
{
if( [inPropertyName isEqualToString: @"short name"] || [inPropertyName isEqualToString: @"name"] )
{
@@ -104,7 +104,7 @@ -(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
}
--(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName
+-(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName inRange: (NSRange)byteRange
{
BOOL propExists = YES;
View
4 Stacksmith/WILDCard.m
@@ -260,7 +260,7 @@ -(BOOL) goThereInNewWindow: (BOOL)inNewWindow
}
--(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
+-(id) valueForWILDPropertyNamed: (NSString*)inPropertyName ofRange: (NSRange)byteRange
{
if( [inPropertyName isEqualToString: @"short name"] || [inPropertyName isEqualToString: @"name"] )
{
@@ -271,7 +271,7 @@ -(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
}
--(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName
+-(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName inRange: (NSRange)byteRange
{
BOOL propExists = YES;
View
4 Stacksmith/WILDPart.m
@@ -1058,7 +1058,7 @@ -(BOOL) goThereInNewWindow: (BOOL)inNewWindow
}
--(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
+-(id) valueForWILDPropertyNamed: (NSString*)inPropertyName ofRange: (NSRange)byteRange
{
if( [inPropertyName isEqualToString: @"short name"] || [inPropertyName isEqualToString: @"name"] )
{
@@ -1217,7 +1217,7 @@ -(NSString*) validatedStyle: (NSString*)userStyle
}
--(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName
+-(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName inRange: (NSRange)byteRange
{
BOOL propExists = YES;
View
4 Stacksmith/WILDStack.m
@@ -564,7 +564,7 @@ -(BOOL) goThereInNewWindow: (BOOL)inNewWindow
}
--(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
+-(id) valueForWILDPropertyNamed: (NSString*)inPropertyName ofRange: (NSRange)byteRange
{
if( [inPropertyName isEqualToString: @"short name"] || [inPropertyName isEqualToString: @"name"] )
{
@@ -575,7 +575,7 @@ -(id) valueForWILDPropertyNamed: (NSString*)inPropertyName
}
--(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName
+-(BOOL) setValue: (id)inValue forWILDPropertyNamed: (NSString*)inPropertyName inRange: (NSRange)byteRange
{
BOOL propExists = YES;

0 comments on commit 51b49e4

Please sign in to comment.