[gjs] gi: Use static argument type names instead of getting them from tag
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] gi: Use static argument type names instead of getting them from tag
- Date: Tue, 13 Oct 2020 04:07:57 +0000 (UTC)
commit 94c5e4e0c397585b392d9af678c2a09320eb24a4
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Mon Aug 10 19:26:41 2020 +0200
gi: Use static argument type names instead of getting them from tag
When using a template-typed function we already have the static type
string available, so we don't need to call another function and use an
extra parameter.
gi/arg.cpp | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 4aefe7fc..75af2c71 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -1549,7 +1549,7 @@ static bool value_to_interface_gi_argument(
template <typename T>
GJS_JSAPI_RETURN_CONVENTION inline static bool gjs_arg_set_from_js_value(
JSContext* cx, const JS::HandleValue& value, GArgument* arg,
- GITypeTag type_tag, const char* arg_name, GjsArgumentType arg_type) {
+ const char* arg_name, GjsArgumentType arg_type) {
bool out_of_range = false;
if (!gjs_arg_set_from_js_value<T>(cx, value, arg, &out_of_range)) {
@@ -1557,7 +1557,7 @@ GJS_JSAPI_RETURN_CONVENTION inline static bool gjs_arg_set_from_js_value(
GjsAutoChar display_name =
gjs_argument_display_name(arg_name, arg_type);
gjs_throw(cx, "value is out of range for %s (type %s)",
- display_name.get(), g_type_tag_to_string(type_tag));
+ display_name.get(), Gjs::static_type_name<T>());
}
return false;
@@ -1596,48 +1596,48 @@ gjs_value_to_g_argument(JSContext *context,
break;
case GI_TYPE_TAG_INT8:
- if (!gjs_arg_set_from_js_value<int8_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<int8_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_UINT8:
- if (!gjs_arg_set_from_js_value<uint8_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<uint8_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_INT16:
- if (!gjs_arg_set_from_js_value<int16_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<int16_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_UINT16:
- if (!gjs_arg_set_from_js_value<uint16_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<uint16_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_INT32:
- if (!gjs_arg_set_from_js_value<int32_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<int32_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_UINT32:
- if (!gjs_arg_set_from_js_value<uint32_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<uint32_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_INT64:
- if (!gjs_arg_set_from_js_value<int64_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<int64_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_UINT64:
- if (!gjs_arg_set_from_js_value<uint64_t>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<uint64_t>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
@@ -1646,14 +1646,14 @@ gjs_value_to_g_argument(JSContext *context,
break;
case GI_TYPE_TAG_FLOAT:
- if (!gjs_arg_set_from_js_value<float>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<float>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
case GI_TYPE_TAG_DOUBLE:
- if (!gjs_arg_set_from_js_value<double>(context, value, arg, type_tag,
- arg_name, arg_type))
+ if (!gjs_arg_set_from_js_value<double>(context, value, arg, arg_name,
+ arg_type))
return false;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]