[cpp] Allow objc protocols to have overloaded functions.

src/generators/gencpp.ml

@@ -4953,17 +4953,22 @@ let generate_protocol_delegate ctx class_def output =
       match field.cf_type with
       |  TFun(args,ret) ->
          let retStr = ctx_type_string ctx ret in
-         let objcName = get_meta_string field.cf_meta Meta.ObjcProtocol in
-         let objcName = if objcName="" then field.cf_name else objcName in
-         output ("- (" ^ retStr ^ ") " ^ objcName);
+         let nativeName = get_meta_string field.cf_meta Meta.ObjcProtocol in
+         let names = if nativeName<>"" then
+            ExtString.String.nsplit nativeName ":" 
+         else
+            List.map (fun (n,_,_) -> n ) args
+         in
+         output ("- (" ^ retStr ^ ") " ^ (if nativeName="" then field.cf_name else (List.hd names) ) );
+
          let first = ref true in
-         List.iter (fun (name,_,argType) ->
+         List.iter2 (fun (name,_,argType) signature_name ->
              if !first then
                output (" :(" ^ (ctx_type_string ctx argType) ^ ")" ^ name )
              else
-               output (" " ^ name ^ ":(" ^ (ctx_type_string ctx argType) ^ ")" ^ name );
+               output (" " ^ signature_name ^ ":(" ^ (ctx_type_string ctx argType) ^ ")" ^ name );
              first := false;
-             ) args;
+             ) args names;
          output (" {\n"); 
          output ("\thx::NativeAttach _hx_attach;\n");
          output ( (if retStr="void" then "\t" else "\treturn ") ^ full_class_name ^ "::" ^ (keyword_remap field.cf_name) ^ "(haxeObj");

std/cpp/objc/NSError.hx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package cpp.objc;
+
+@:objc
+@:native("NSError")
+extern class NSError
+{
+   public var localizedDescription(default,null):NSString;
+}
+

std/cpp/objc/StringIdMap.hx

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package cpp.objc;
+
+@:native("NSDictionary<NSString *, id>") @:objc extern class StringIdMapData { }
+
+@:objc
+extern abstract StringIdMap( StringIdMapData )
+{
+   @:native("_hx_obj_to_nsdictionary") @:extern static function ObjectToStringIdMapData(obj:{}) : StringIdMapData return null;
+   @:native("_hx_nsdictionary_to_obj") @:extern static function StringIdMapDataToObject(d:StringIdMapData) : {} return null;
+
+
+   inline function new(dict:StringIdMapData) this = dict;
+
+   @:from @:extern
+   static public inline function fromObject(o:{}):StringIdMap return new StringIdMap( ObjectToStringIdMapData(o) );
+
+   @:to @:extern
+   public inline function toObject():{} return StringIdMapDataToObject(this);
+
+}
+