[gimp] libgimpwidgets: use struct, not parameters, to pass eevl options
- From: N/A <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: use struct, not parameters, to pass eevl options
- Date: Wed, 4 Oct 2017 18:26:16 +0000 (UTC)
commit 7362d47922147092b13cdedfb6cba09e6fded2a7
Author: Ell <ell_se yahoo com>
Date: Wed Oct 4 08:41:16 2017 -0400
libgimpwidgets: use struct, not parameters, to pass eevl options
Pass the evaluation options to gimp_eevl_evaluate() using a single
parameter of type GimpEevlOptions, instead of using individual
parameters for each option. Add a GIMP_EEVL_OPTIONS_INIT macro,
used to initialize a GimpEevlOptions struct to the default set of
options. This would allow us to add evaluation options more
easily.
libgimpwidgets/gimpeevl.c | 135 +++++++++++++++++++---------------------
libgimpwidgets/gimpeevl.h | 31 +++++++--
libgimpwidgets/gimpsizeentry.c | 7 ++-
libgimpwidgets/test-eevl.c | 18 +++---
4 files changed, 104 insertions(+), 87 deletions(-)
---
diff --git a/libgimpwidgets/gimpeevl.c b/libgimpwidgets/gimpeevl.c
index a72c518..2cb0a06 100644
--- a/libgimpwidgets/gimpeevl.c
+++ b/libgimpwidgets/gimpeevl.c
@@ -105,62 +105,58 @@ typedef struct
typedef struct
{
- const gchar *string;
- GimpEevlUnitResolverProc unit_resolver_proc;
- gpointer data;
+ const gchar *string;
+ GimpEevlOptions options;
- GimpEevlToken current_token;
- const gchar *start_of_current_token;
+ GimpEevlToken current_token;
+ const gchar *start_of_current_token;
-
- jmp_buf catcher;
- const gchar *error_message;
+ jmp_buf catcher;
+ const gchar *error_message;
} GimpEevl;
-static void gimp_eevl_init (GimpEevl *eva,
- const gchar *string,
- GimpEevlUnitResolverProc unit_resolver_proc,
- gpointer data);
-static GimpEevlQuantity gimp_eevl_complete (GimpEevl *eva);
-static GimpEevlQuantity gimp_eevl_expression (GimpEevl *eva);
-static GimpEevlQuantity gimp_eevl_term (GimpEevl *eva);
-static GimpEevlQuantity gimp_eevl_signed_factor (GimpEevl *eva);
-static GimpEevlQuantity gimp_eevl_factor (GimpEevl *eva);
-static gboolean gimp_eevl_accept (GimpEevl *eva,
- GimpEevlTokenType token_type,
- GimpEevlToken *consumed_token);
-static void gimp_eevl_lex (GimpEevl *eva);
-static void gimp_eevl_lex_accept_count (GimpEevl *eva,
- gint count,
- GimpEevlTokenType token_type);
-static void gimp_eevl_lex_accept_to (GimpEevl *eva,
- gchar *to,
- GimpEevlTokenType token_type);
-static void gimp_eevl_move_past_whitespace (GimpEevl *eva);
-static gboolean gimp_eevl_unit_identifier_start (gunichar c);
-static gboolean gimp_eevl_unit_identifier_continue (gunichar c);
-static gint gimp_eevl_unit_identifier_size (const gchar *s,
- gint start);
-static void gimp_eevl_expect (GimpEevl *eva,
- GimpEevlTokenType token_type,
- GimpEevlToken *value);
-static void gimp_eevl_error (GimpEevl *eva,
- gchar *msg);
+static void gimp_eevl_init (GimpEevl *eva,
+ const gchar *string,
+ const GimpEevlOptions *options);
+static GimpEevlQuantity gimp_eevl_complete (GimpEevl *eva);
+static GimpEevlQuantity gimp_eevl_expression (GimpEevl *eva);
+static GimpEevlQuantity gimp_eevl_term (GimpEevl *eva);
+static GimpEevlQuantity gimp_eevl_signed_factor (GimpEevl *eva);
+static GimpEevlQuantity gimp_eevl_factor (GimpEevl *eva);
+static gboolean gimp_eevl_accept (GimpEevl *eva,
+ GimpEevlTokenType token_type,
+ GimpEevlToken *consumed_token);
+static void gimp_eevl_lex (GimpEevl *eva);
+static void gimp_eevl_lex_accept_count (GimpEevl *eva,
+ gint count,
+ GimpEevlTokenType token_type);
+static void gimp_eevl_lex_accept_to (GimpEevl *eva,
+ gchar *to,
+ GimpEevlTokenType token_type);
+static void gimp_eevl_move_past_whitespace (GimpEevl *eva);
+static gboolean gimp_eevl_unit_identifier_start (gunichar c);
+static gboolean gimp_eevl_unit_identifier_continue (gunichar c);
+static gint gimp_eevl_unit_identifier_size (const gchar *s,
+ gint start);
+static void gimp_eevl_expect (GimpEevl *eva,
+ GimpEevlTokenType token_type,
+ GimpEevlToken *value);
+static void gimp_eevl_error (GimpEevl *eva,
+ gchar *msg);
/**
* gimp_eevl_evaluate:
- * @string: The NULL-terminated string to be evaluated.
- * @unit_resolver_proc: Unit resolver callback.
- * @result: Result of evaluation.
- * @data: Data passed to unit resolver.
- * @error_pos: Will point to the positon within the string,
- * before which the parse / evaluation error
- * occurred. Will be set to null of no error occurred.
- * @error_message: Will point to a static string with a semi-descriptive
- * error message if parsing / evaluation failed.
+ * @string: The NULL-terminated string to be evaluated.
+ * @options: Evaluations options.
+ * @result: Result of evaluation.
+ * @error_pos: Will point to the positon within the string,
+ * before which the parse / evaluation error
+ * occurred. Will be set to null of no error occurred.
+ * @error_message: Will point to a static string with a semi-descriptive
+ * error message if parsing / evaluation failed.
*
* Evaluates the given arithmetic expression, along with an optional dimension
* analysis, and basic unit conversions.
@@ -174,24 +170,23 @@ static void gimp_eevl_error (GimpEevl
* order of two means in^2).
**/
gboolean
-gimp_eevl_evaluate (const gchar *string,
- GimpEevlUnitResolverProc unit_resolver_proc,
- GimpEevlQuantity *result,
- gpointer data,
- const gchar **error_pos,
- GError **error)
+gimp_eevl_evaluate (const gchar *string,
+ const GimpEevlOptions *options,
+ GimpEevlQuantity *result,
+ const gchar **error_pos,
+ GError **error)
{
GimpEevl eva;
g_return_val_if_fail (g_utf8_validate (string, -1, NULL), FALSE);
- g_return_val_if_fail (unit_resolver_proc != NULL, FALSE);
+ g_return_val_if_fail (options != NULL, FALSE);
+ g_return_val_if_fail (options->unit_resolver_proc != NULL, FALSE);
g_return_val_if_fail (result != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
gimp_eevl_init (&eva,
string,
- unit_resolver_proc,
- data);
+ options);
if (!setjmp (eva.catcher)) /* try... */
{
@@ -214,14 +209,12 @@ gimp_eevl_evaluate (const gchar *string,
}
static void
-gimp_eevl_init (GimpEevl *eva,
- const gchar *string,
- GimpEevlUnitResolverProc unit_resolver_proc,
- gpointer data)
+gimp_eevl_init (GimpEevl *eva,
+ const gchar *string,
+ const GimpEevlOptions *options)
{
- eva->string = string;
- eva->unit_resolver_proc = unit_resolver_proc;
- eva->data = data;
+ eva->string = string;
+ eva->options = *options;
eva->current_token.type = GIMP_EEVL_TOKEN_END;
@@ -246,9 +239,9 @@ gimp_eevl_complete (GimpEevl *eva)
/* There should be nothing left to parse by now */
gimp_eevl_expect (eva, GIMP_EEVL_TOKEN_END, 0);
- eva->unit_resolver_proc (NULL,
- &default_unit_factor,
- eva->data);
+ eva->options.unit_resolver_proc (NULL,
+ &default_unit_factor,
+ eva->options.data);
/* Entire expression is dimensionless, apply default unit if
* applicable
@@ -282,9 +275,9 @@ gimp_eevl_expression (GimpEevl *eva)
{
GimpEevlQuantity default_unit_factor;
- eva->unit_resolver_proc (NULL,
- &default_unit_factor,
- eva->data);
+ eva->options.unit_resolver_proc (NULL,
+ &default_unit_factor,
+ eva->options.data);
if (new_term.dimension == 0 &&
evaluated_terms.dimension == default_unit_factor.dimension)
@@ -393,9 +386,9 @@ gimp_eevl_factor (GimpEevl *eva)
strncpy (identifier, consumed_token.value.c, consumed_token.value.size);
identifier[consumed_token.value.size] = '\0';
- if (eva->unit_resolver_proc (identifier,
- &result,
- eva->data))
+ if (eva->options.unit_resolver_proc (identifier,
+ &result,
+ eva->options.data))
{
evaluated_factor.value /= result.value;
evaluated_factor.dimension += result.dimension;
diff --git a/libgimpwidgets/gimpeevl.h b/libgimpwidgets/gimpeevl.h
index a7a2c5b..0546ace 100644
--- a/libgimpwidgets/gimpeevl.h
+++ b/libgimpwidgets/gimpeevl.h
@@ -54,12 +54,31 @@ typedef gboolean (* GimpEevlUnitResolverProc) (const gchar *identifier,
GimpEevlQuantity *result,
gpointer data);
-gboolean gimp_eevl_evaluate (const gchar *string,
- GimpEevlUnitResolverProc unit_resolver_proc,
- GimpEevlQuantity *result,
- gpointer data,
- const gchar **error_pos,
- GError **error);
+
+/**
+ * GimpEevlOptions:
+ * @unit_resolver_proc: Unit resolver callback.
+ * @data: Data passed to unit resolver.
+ */
+typedef struct
+{
+ GimpEevlUnitResolverProc unit_resolver_proc;
+ gpointer data;
+} GimpEevlOptions;
+
+#define GIMP_EEVL_OPTIONS_INIT \
+ ((const GimpEevlOptions) \
+ { \
+ .unit_resolver_proc = NULL, \
+ .data = NULL \
+ })
+
+
+gboolean gimp_eevl_evaluate (const gchar *string,
+ const GimpEevlOptions *options,
+ GimpEevlQuantity *result,
+ const gchar **error_pos,
+ GError **error);
G_END_DECLS
diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c
index 12e88a6..9ac1030 100644
--- a/libgimpwidgets/gimpsizeentry.c
+++ b/libgimpwidgets/gimpsizeentry.c
@@ -1270,6 +1270,7 @@ gimp_size_entry_eevl_input_callback (GtkSpinButton *spinner,
gpointer *data)
{
GimpSizeEntryField *gsef = (GimpSizeEntryField *) data;
+ GimpEevlOptions options = GIMP_EEVL_OPTIONS_INIT;
gboolean success = FALSE;
const gchar *error_pos = 0;
GError *error = NULL;
@@ -1278,10 +1279,12 @@ gimp_size_entry_eevl_input_callback (GtkSpinButton *spinner,
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (spinner), FALSE);
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (gsef->gse), FALSE);
+ options.unit_resolver_proc = gimp_size_entry_eevl_unit_resolver;
+ options.data = data;
+
success = gimp_eevl_evaluate (gtk_entry_get_text (GTK_ENTRY (spinner)),
- gimp_size_entry_eevl_unit_resolver,
+ &options,
&result,
- data,
&error_pos,
&error);
if (! success)
diff --git a/libgimpwidgets/test-eevl.c b/libgimpwidgets/test-eevl.c
index 8addac8..aac6e10 100644
--- a/libgimpwidgets/test-eevl.c
+++ b/libgimpwidgets/test-eevl.c
@@ -112,17 +112,19 @@ main(void)
for (i = 0; cases[i].string; i++)
{
- const gchar *test = cases[i].string;
- GimpEevlQuantity should = cases[i].result;
- GimpEevlQuantity result = { 0, -1 };
- gboolean should_succeed = cases[i].should_succeed;
- GError *error = NULL;
- const gchar *error_pos = 0;
+ const gchar *test = cases[i].string;
+ GimpEevlOptions options = GIMP_EEVL_OPTIONS_INIT;
+ GimpEevlQuantity should = cases[i].result;
+ GimpEevlQuantity result = { 0, -1 };
+ gboolean should_succeed = cases[i].should_succeed;
+ GError *error = NULL;
+ const gchar *error_pos = 0;
+
+ options.unit_resolver_proc = test_units;
gimp_eevl_evaluate (test,
- test_units,
+ &options,
&result,
- NULL,
&error_pos,
&error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
