Merge pull request #3 from runrevsebastien/feature-lcidlc_CF_types

livecodesebastien · livecodesebastien · commit eaacc3f033dc · 2015-02-13T15:33:40.000Z
[[ LCIDLC CF types ]] Added non-releasing CF* types as input parameter f...
diff --git a/engine/src/externalv1.cpp b/engine/src/externalv1.cpp
@@ -124,6 +124,13 @@ enum
     // SN-2015-01-19: [[ Bug 14057 ]] Added forgotten C-char value type
     kMCExternalValueOptionAsCChar = 22,
     
+    // SN-2015-02-13:[[ Bug 14057 ]] Added CF-types (non-releasing)
+    kMCExternalValueOptionAsCFNumber = 23,
+    kMCExternalValueOptionAsCFString = 24,
+    kMCExternalValueOptionAsCFData = 25,
+    kMCExternalValueOptionAsCFArray = 26,
+    kMCExternalValueOptionAsCFDictionary = 27,
+    
 	kMCExternalValueOptionCaseSensitiveMask = 3 << 30,
 	kMCExternalValueOptionDefaultCaseSensitive = 0 << 30,
 	kMCExternalValueOptionCaseSensitive = 1 << 30,
@@ -2178,6 +2185,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte
     }
 #ifdef __HAS_CORE_FOUNDATION__
     case kMCExternalValueOptionAsNSNumber:
+    case kMCExternalValueOptionAsCFNumber:
     {
         CFNumberRef t_number;
         real64_t t_real;
@@ -2195,6 +2203,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte
         break;
     }
     case kMCExternalValueOptionAsNSString:
+    case kMCExternalValueOptionAsCFString:
     {
         MCAutoStringRef t_stringref;
         
@@ -2211,6 +2220,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte
         break;
     }
     case kMCExternalValueOptionAsNSData:
+    case kMCExternalValueOptionAsCFData:
     {
         MCAutoStringRef t_stringref;
         char *t_chars;
@@ -2231,6 +2241,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte
         break;
     }
     case kMCExternalValueOptionAsNSArray:
+    case kMCExternalValueOptionAsCFArray:
     {
         MCExternalError t_error;
         NSArray* t_value;
@@ -2257,6 +2268,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte
         return t_error;
     }
     case kMCExternalValueOptionAsNSDictionary:
+    case kMCExternalValueOptionAsCFDictionary:
     {
         MCExternalError t_error;
         NSDictionary* t_value;
diff --git a/lcidlc/include/LiveCode.h b/lcidlc/include/LiveCode.h
@@ -370,6 +370,19 @@ enum
 	
 	// The 'value' parameter is a pointer to a char variable (native encoding)
 	kLCValueOptionAsCChar = 22,
+    
+    // SN-2015-02-13: [[ ExternalsApiV6 ]] Added CF-type arguments, which
+    //  are NOT autoreleased when used as input
+    // The 'value' parameter is a pointer to an CFNumberRef variable.
+    kLCValueOptionAsCFNumber = 23,
+    // The 'value' parameter is a pointer to an CFStringRef variable.
+    kLCValueOptionAsCFString = 24,
+    // The 'value' parameter is a pointer to an CFDataRef variable.
+    kLCValueOptionAsCFData = 25,
+    // The 'value' parameter is a pointer to an CFArrayRef variable.
+    kLCValueOptionAsCFArray = 26,
+    // The 'value' parameter is a pointer to an CFDictionaryRef variable.
+    kLCValueOptionAsCFDictionary = 27,
 	
 	// Treat array keys as case-insensitive.
 	kLCValueOptionCaseSensitiveFalse = 0 << 30,
diff --git a/lcidlc/src/Support.mm b/lcidlc/src/Support.mm
@@ -140,6 +140,16 @@
     kMCOptionAsObjcArray = 20,
     kMCOptionAsObjcDictionary = 21,
     
+    // SN-2015-02-13: [[ Bug 14057 ]] Added forgotten C-char type
+    kMCOptionAsCChar = 22,
+    
+    // SN-2015-02-13:[[ Bug 14057 ]] Added CF-types (non-releasing)
+    kMCOptionAsCFNumber = 23,
+    kMCOptionAsCFString = 24,
+    kMCOptionAsCFData = 25,
+    kMCOptionAsCFArray = 26,
+    kMCOptionAsCFDictionary = 27,
+    
 	kMCOptionNumberFormatDefault = 0 << 26,
 	kMCOptionNumberFormatDecimal = 1 << 26,
 	kMCOptionNumberFormatScientific = 2 << 26,

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,13 @@ enum`
`124`	`124`	`// SN-2015-01-19: [[ Bug 14057 ]] Added forgotten C-char value type`
`125`	`125`	`kMCExternalValueOptionAsCChar = 22,`
`126`	`126`
	`127`	`+ // SN-2015-02-13:[[ Bug 14057 ]] Added CF-types (non-releasing)`
	`128`	`+ kMCExternalValueOptionAsCFNumber = 23,`
	`129`	`+ kMCExternalValueOptionAsCFString = 24,`
	`130`	`+ kMCExternalValueOptionAsCFData = 25,`
	`131`	`+ kMCExternalValueOptionAsCFArray = 26,`
	`132`	`+ kMCExternalValueOptionAsCFDictionary = 27,`
	`133`	`+`
`127`	`134`	`kMCExternalValueOptionCaseSensitiveMask = 3 << 30,`
`128`	`135`	`kMCExternalValueOptionDefaultCaseSensitive = 0 << 30,`
`129`	`136`	`kMCExternalValueOptionCaseSensitive = 1 << 30,`
`@@ -2178,6 +2185,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte`
`2178`	`2185`	`}`
`2179`	`2186`	`#ifdef __HAS_CORE_FOUNDATION__`
`2180`	`2187`	`case kMCExternalValueOptionAsNSNumber:`
	`2188`	`+ case kMCExternalValueOptionAsCFNumber:`
`2181`	`2189`	`{`
`2182`	`2190`	`CFNumberRef t_number;`
`2183`	`2191`	`real64_t t_real;`
`@@ -2195,6 +2203,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte`
`2195`	`2203`	`break;`
`2196`	`2204`	`}`
`2197`	`2205`	`case kMCExternalValueOptionAsNSString:`
	`2206`	`+ case kMCExternalValueOptionAsCFString:`
`2198`	`2207`	`{`
`2199`	`2208`	`MCAutoStringRef t_stringref;`
`2200`	`2209`
`@@ -2211,6 +2220,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte`
`2211`	`2220`	`break;`
`2212`	`2221`	`}`
`2213`	`2222`	`case kMCExternalValueOptionAsNSData:`
	`2223`	`+ case kMCExternalValueOptionAsCFData:`
`2214`	`2224`	`{`
`2215`	`2225`	`MCAutoStringRef t_stringref;`
`2216`	`2226`	`char *t_chars;`
`@@ -2231,6 +2241,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte`
`2231`	`2241`	`break;`
`2232`	`2242`	`}`
`2233`	`2243`	`case kMCExternalValueOptionAsNSArray:`
	`2244`	`+ case kMCExternalValueOptionAsCFArray:`
`2234`	`2245`	`{`
`2235`	`2246`	`MCExternalError t_error;`
`2236`	`2247`	`NSArray* t_value;`
`@@ -2257,6 +2268,7 @@ static MCExternalError MCExternalVariableFetch(MCExternalVariableRef var, MCExte`
`2257`	`2268`	`return t_error;`
`2258`	`2269`	`}`
`2259`	`2270`	`case kMCExternalValueOptionAsNSDictionary:`
	`2271`	`+ case kMCExternalValueOptionAsCFDictionary:`
`2260`	`2272`	`{`
`2261`	`2273`	`MCExternalError t_error;`
`2262`	`2274`	`NSDictionary* t_value;`