From 56bb22c988ce84995a674e3b5f58cc22dfc41a8b Mon Sep 17 00:00:00 2001
From: karroffel <therzog@mail.de>
Date: Thu, 21 Feb 2019 20:12:57 +0100
Subject: [PATCH] added godot_dictionary_get_with_default to GDNative

Recently, Dictionary::get() was introduced, which acts like a index
operator but allows the caller to specify a default value to return
instead of issuing an error.

This commit adds a new GDNative function that includes the default value.
---
 modules/gdnative/gdnative/dictionary.cpp      | 14 +++++++++++
 modules/gdnative/gdnative_api.json            | 25 +++++++++++++------
 .../gdnative/include/gdnative/dictionary.h    |  4 +++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/modules/gdnative/gdnative/dictionary.cpp b/modules/gdnative/gdnative/dictionary.cpp
index a18d221a7cb..2c6c9e2de2e 100644
--- a/modules/gdnative/gdnative/dictionary.cpp
+++ b/modules/gdnative/gdnative/dictionary.cpp
@@ -155,12 +155,26 @@ godot_string GDAPI godot_dictionary_to_json(const godot_dictionary *p_self) {
 	return raw_dest;
 }
 
+// GDNative core 1.1
+
 godot_bool GDAPI godot_dictionary_erase_with_return(godot_dictionary *p_self, const godot_variant *p_key) {
 	Dictionary *self = (Dictionary *)p_self;
 	const Variant *key = (const Variant *)p_key;
 	return self->erase(*key);
 }
 
+godot_variant GDAPI godot_dictionary_get_with_default(const godot_dictionary *p_self, const godot_variant *p_key, const godot_variant *p_default) {
+	const Dictionary *self = (const Dictionary *)p_self;
+	const Variant *key = (const Variant *)p_key;
+	const Variant *def = (const Variant *)p_default;
+
+	godot_variant raw_dest;
+	Variant *dest = (Variant *)&raw_dest;
+	memnew_placement(dest, Variant(self->get(*key, *def)));
+
+	return raw_dest;
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index 76804714096..bdcd51085ff 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -106,6 +106,23 @@
             ["const godot_real", "p_t"]
           ]
         },
+        {
+          "name": "godot_dictionary_get_with_default",
+          "return_type": "godot_variant",
+          "arguments": [
+            ["const godot_dictionary *", "p_self"],
+            ["const godot_variant *", "p_key"],
+            ["const godot_variant *", "p_default"]
+          ]
+        },
+        {
+          "name": "godot_dictionary_erase_with_return",
+          "return_type": "bool",
+          "arguments": [
+            ["godot_dictionary *", "p_self"],
+            ["const godot_variant *", "p_key"]
+          ]
+        },
         {
           "name": "godot_node_path_get_as_property_path",
           "return_type": "godot_node_path",
@@ -233,14 +250,6 @@
             ["const godot_vector3 *", "p_scale"]
           ]
         },
-        {
-          "name": "godot_dictionary_erase_with_return",
-          "return_type": "bool",
-          "arguments": [
-            ["godot_dictionary *", "p_self"],
-            ["const godot_variant *", "p_key"]
-          ]
-        },
         {
           "name": "godot_is_instance_valid",
           "return_type": "bool",
diff --git a/modules/gdnative/include/gdnative/dictionary.h b/modules/gdnative/include/gdnative/dictionary.h
index 77037428994..14e35b46928 100644
--- a/modules/gdnative/include/gdnative/dictionary.h
+++ b/modules/gdnative/include/gdnative/dictionary.h
@@ -94,8 +94,12 @@ godot_bool GDAPI godot_dictionary_operator_equal(const godot_dictionary *p_self,
 
 godot_string GDAPI godot_dictionary_to_json(const godot_dictionary *p_self);
 
+// GDNative core 1.1
+
 godot_bool GDAPI godot_dictionary_erase_with_return(godot_dictionary *p_self, const godot_variant *p_key);
 
+godot_variant GDAPI godot_dictionary_get_with_default(const godot_dictionary *p_self, const godot_variant *p_key, const godot_variant *p_default);
+
 #ifdef __cplusplus
 }
 #endif