core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-486

This commit is contained in:
Enrico Fucile 2017-05-30 15:18:50 +01:00
parent 192b437aaa
commit dcf8c563fb
8 changed files with 195 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -312,6 +312,7 @@ list( APPEND grib_api_srcs
grib_errors.c
grib_expression_class_binop.c
grib_expression_class_logical_and.c
grib_expression_class_logical_or.c
grib_expression_class_is_in_dict.c
grib_expression_class_true.c
grib_expression_class_string_compare.c

1
src/Makefile.am
View File

@ -327,6 +327,7 @@ libeccodes_la_prototypes= \
grib_errors.c \
grib_expression_class_binop.c \
grib_expression_class_logical_and.c \
grib_expression_class_logical_or.c \
grib_expression_class_is_in_dict.c \
grib_expression_class_true.c \
grib_expression_class_string_compare.c \

3
src/grib_api_prototypes.h
View File

@ -1278,6 +1278,9 @@ grib_expression *new_binop_expression(grib_context *c, grib_binop_long_proc long
/* grib_expression_class_logical_and.c */
grib_expression *new_logical_and_expression(grib_context *c, grib_expression *left, grib_expression *right);
/* grib_expression_class_logical_or.c */
grib_expression *new_logical_or_expression(grib_context *c, grib_expression *left, grib_expression *right);
/* grib_expression_class_is_in_dict.c */
grib_expression *new_is_in_dict_expression(grib_context *c, const char *name, const char *list);

1
src/grib_expression_class.h
View File

@ -10,6 +10,7 @@ extern grib_expression_class* grib_expression_class_is_in_list;
extern grib_expression_class* grib_expression_class_is_integer;
extern grib_expression_class* grib_expression_class_length;
extern grib_expression_class* grib_expression_class_logical_and;
extern grib_expression_class* grib_expression_class_logical_or;
extern grib_expression_class* grib_expression_class_long;
extern grib_expression_class* grib_expression_class_string;
extern grib_expression_class* grib_expression_class_string_compare;

186
src/grib_expression_class_logical_or.c Normal file
View File

@ -0,0 +1,186 @@
/*
* Copyright 2005-2017 ECMWF.
*
* This software is licensed under the terms of the Apache Licence Version 2.0
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
*
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
#include "grib_api_internal.h"
/*
This is used by make_class.pl
START_CLASS_DEF
CLASS = expression
IMPLEMENTS = init_class
IMPLEMENTS = destroy
IMPLEMENTS = native_type
IMPLEMENTS = evaluate_long
IMPLEMENTS = evaluate_double
IMPLEMENTS = print
IMPLEMENTS = add_dependency
MEMBERS = grib_expression *left
MEMBERS = grib_expression *right
END_CLASS_DEF
*/
/* START_CLASS_IMP */
/*
Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
Instead edit values between START_CLASS_DEF and END_CLASS_DEF
or edit "expression.class" and rerun ./make_class.pl
*/
typedef const char* string; /* to keep make_class.pl happy */
static void init_class (grib_expression_class*);
static void destroy(grib_context*,grib_expression* e);
static void print(grib_context*,grib_expression*,grib_handle*);
static void add_dependency(grib_expression* e, grib_accessor* observer);
static int native_type(grib_expression*,grib_handle*);
static int evaluate_long(grib_expression*,grib_handle*,long*);
static int evaluate_double(grib_expression*,grib_handle*,double*);
typedef struct grib_expression_logical_or{
grib_expression base;
/* Members defined in logical_or */
grib_expression *left;
grib_expression *right;
} grib_expression_logical_or;
static grib_expression_class _grib_expression_class_logical_or = {
0, /* super */
"logical_or", /* name */
sizeof(grib_expression_logical_or),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
&add_dependency,
&native_type,
0,
&evaluate_long,
&evaluate_double,
0,
};
grib_expression_class* grib_expression_class_logical_or = &_grib_expression_class_logical_or;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression *g,grib_handle* h,long* lres)
{
long v1=0;
long v2=0;
double dv1=0;
double dv2=0;
int ret;
grib_expression_logical_or* e = (grib_expression_logical_or*)g;
switch (grib_expression_native_type(h, e->left)) {
case GRIB_TYPE_LONG:
ret = grib_expression_evaluate_long(h,e->left,&v1);
if (ret != GRIB_SUCCESS) return ret;
if (v1 != 0) {
*lres=1;
return ret;
}
break;
case GRIB_TYPE_DOUBLE:
ret = grib_expression_evaluate_double(h,e->left,&dv1);
if (ret != GRIB_SUCCESS) return ret;
if (dv1 != 0) {
*lres=1;
return ret;
}
break;
default :
return GRIB_INVALID_TYPE;
}
switch (grib_expression_native_type(h, e->right)) {
case GRIB_TYPE_LONG:
ret = grib_expression_evaluate_long(h,e->right,&v2);
if (ret != GRIB_SUCCESS) return ret;
*lres = v2 ? 1 : 0;
break;
case GRIB_TYPE_DOUBLE:
ret = grib_expression_evaluate_double(h,e->right,&dv2);
if (ret != GRIB_SUCCESS) return ret;
*lres = dv2 ? 1 : 0;
break;
default :
return GRIB_INVALID_TYPE;
}
return GRIB_SUCCESS;
}
static int evaluate_double(grib_expression *g,grib_handle* h,double* dres)
{
long lres=0;
int ret=0;
ret=evaluate_long(g,h,&lres);
*dres=(double)lres;
return ret;
}
static void print(grib_context* c,grib_expression* g,grib_handle* f)
{
grib_expression_logical_or* e = (grib_expression_logical_or*)g;
printf("(");
grib_expression_print(c,e->left,f);
printf(" && ");
grib_expression_print(c,e->right,f);
printf(")");
}
static void destroy(grib_context* c,grib_expression* g)
{
grib_expression_logical_or* e = (grib_expression_logical_or*)g;
grib_expression_free(c,e->left);
grib_expression_free(c,e->right);
}
static void add_dependency(grib_expression* g, grib_accessor* observer)
{
grib_expression_logical_or* e = (grib_expression_logical_or*)g;
grib_dependency_observe_expression(observer,e->left);
grib_dependency_observe_expression(observer,e->right);
}
grib_expression* new_logical_or_expression(grib_context* c, grib_expression* left,grib_expression* right)
{
grib_expression_logical_or* e = (grib_expression_logical_or*)grib_context_malloc_clear_persistent(c,sizeof(grib_expression_logical_or));
e->base.cclass = grib_expression_class_logical_or;
e->left = left;
e->right = right;
return (grib_expression*)e;
}
static int native_type(grib_expression* g,grib_handle *h)
{
return GRIB_TYPE_LONG;
}

1
src/grib_expression_factory.h
View File

@ -10,6 +10,7 @@
{ "is_integer", &grib_expression_class_is_integer, },
{ "length", &grib_expression_class_length, },
{ "logical_and", &grib_expression_class_logical_and, },
{ "logical_or", &grib_expression_class_logical_or, },
{ "long", &grib_expression_class_long, },
{ "string", &grib_expression_class_string, },
{ "string_compare", &grib_expression_class_string_compare, },

2
src/grib_yacc.c
View File

@ -3917,7 +3917,7 @@ grib_yyreduce:
case 254:
/* Line 1792 of yacc.c */
#line 824 "griby.y"
{ (grib_yyval.exp) = new_binop_expression(grib_parser_context,&grib_op_or,NULL,(grib_yyvsp[(1) - (3)].exp),(grib_yyvsp[(3) - (3)].exp));}
{ (grib_yyval.exp) = new_logical_or_expression(grib_parser_context,(grib_yyvsp[(1) - (3)].exp),(grib_yyvsp[(3) - (3)].exp));}
break;
case 259:

2
src/griby.y
View File

@ -821,7 +821,7 @@ conjonction : conjonction AND condition { $$ = new_logical_and_expression(grib_p
| condition
;
disjonction : disjonction OR conjonction { $$ = new_binop_expression(grib_parser_context,&grib_op_or,NULL,$1,$3);}
disjonction : disjonction OR conjonction { $$ = new_logical_or_expression(grib_parser_context,$1,$3);}
| conjonction
;