Expressions: Dead code removal

This commit is contained in:
shahramn 2024-02-23 15:58:16 +00:00
parent 27b7b44eb7
commit be75fa1a78
18 changed files with 111 additions and 302 deletions

View File

@ -1,17 +1,11 @@
typedef const char* string; /* to keep make_class.pl happy */
static void init_class (grib_expression_class*);
static void init(grib_expression* e);
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 string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -28,7 +22,6 @@ static grib_expression_class _grib_expression_class_NAME = {
"NAME", /* name */
sizeof(grib_expression_NAME),/* size of instance */
0, /* inited */
&init_class, /* init_class */
&init, /* constructor */
&destroy, /* destructor */
&print,
@ -44,8 +37,3 @@ grib_expression_class* grib_expression_class_NAME = &_grib_expression_class_NAME
ADD_TO_FILE grib_expression_class.h extern grib_expression_class* grib_expression_class_NAME;
ADD_TO_FILE grib_expression_factory.h { "NAME", &grib_expression_class_NAME, },
static void init_class(grib_expression_class* c)
{
INIT
}

View File

@ -1086,7 +1086,6 @@ struct grib_expression_class
size_t size;
int inited;
expression_class_init_proc init_class;
expression_init_proc init;
expression_destroy_proc destroy;

View File

@ -41,17 +41,11 @@ 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 string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_accessor = {
"accessor", /* name */
sizeof(grib_expression_accessor),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_accessor = {
grib_expression_class* grib_expression_class_accessor = &_grib_expression_class_accessor;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static const char* get_name(grib_expression* g)

View File

@ -41,16 +41,10 @@ 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*);
@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_binop = {
"binop", /* name */
sizeof(grib_expression_binop),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_binop = {
grib_expression_class* grib_expression_class_binop = &_grib_expression_class_binop;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -37,16 +37,10 @@ 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*);
@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_double = {
"double", /* name */
sizeof(grib_expression_double),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_double = {
grib_expression_class* grib_expression_class_double = &_grib_expression_class_double;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -37,16 +37,10 @@ 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*);
typedef struct grib_expression_functor{
@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_functor = {
"functor", /* name */
sizeof(grib_expression_functor),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_functor = {
grib_expression_class* grib_expression_class_functor = &_grib_expression_class_functor;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -39,16 +39,10 @@ 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 print(grib_context*,grib_expression*,grib_handle*);
static void add_dependency(grib_expression* e, grib_accessor* observer);
static string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -66,7 +60,6 @@ static grib_expression_class _grib_expression_class_is_in_dict = {
"is_in_dict", /* name */
sizeof(grib_expression_is_in_dict),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
0, /* destructor */
&print,
@ -80,10 +73,6 @@ static grib_expression_class _grib_expression_class_is_in_dict = {
grib_expression_class* grib_expression_class_is_in_dict = &_grib_expression_class_is_in_dict;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */

View File

@ -40,17 +40,11 @@ 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 string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -68,7 +62,6 @@ static grib_expression_class _grib_expression_class_is_in_list = {
"is_in_list", /* name */
sizeof(grib_expression_is_in_list),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -82,10 +75,6 @@ static grib_expression_class _grib_expression_class_is_in_list = {
grib_expression_class* grib_expression_class_is_in_list = &_grib_expression_class_is_in_list;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */

View File

@ -41,17 +41,11 @@ 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 string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_is_integer = {
"is_integer", /* name */
sizeof(grib_expression_is_integer),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_is_integer = {
grib_expression_class* grib_expression_class_is_integer = &_grib_expression_class_is_integer;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static const char* get_name(grib_expression* g)

View File

@ -41,17 +41,11 @@ 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 string get_name(grib_expression* e);
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*);
static string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
@ -70,7 +64,6 @@ static grib_expression_class _grib_expression_class_length = {
"length", /* name */
sizeof(grib_expression_length),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -84,10 +77,6 @@ static grib_expression_class _grib_expression_class_length = {
grib_expression_class* grib_expression_class_length = &_grib_expression_class_length;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static const char* get_name(grib_expression* g)

View File

@ -15,7 +15,6 @@
START_CLASS_DEF
CLASS = expression
IMPLEMENTS = init_class
IMPLEMENTS = destroy
IMPLEMENTS = native_type
IMPLEMENTS = evaluate_long
@ -39,16 +38,10 @@ 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*);
@ -65,7 +58,6 @@ static grib_expression_class _grib_expression_class_logical_and = {
"logical_and", /* name */
sizeof(grib_expression_logical_and),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -79,10 +71,6 @@ static grib_expression_class _grib_expression_class_logical_and = {
grib_expression_class* grib_expression_class_logical_and = &_grib_expression_class_logical_and;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -15,7 +15,6 @@
START_CLASS_DEF
CLASS = expression
IMPLEMENTS = init_class
IMPLEMENTS = destroy
IMPLEMENTS = native_type
IMPLEMENTS = evaluate_long
@ -39,16 +38,10 @@ 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*);
@ -65,7 +58,6 @@ static grib_expression_class _grib_expression_class_logical_or = {
"logical_or", /* name */
sizeof(grib_expression_logical_or),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -79,10 +71,6 @@ static grib_expression_class _grib_expression_class_logical_or = {
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)

View File

@ -37,16 +37,10 @@ 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*);
@ -62,7 +56,6 @@ static grib_expression_class _grib_expression_class_long = {
"long", /* name */
sizeof(grib_expression_long),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -76,10 +69,6 @@ static grib_expression_class _grib_expression_class_long = {
grib_expression_class* grib_expression_class_long = &_grib_expression_class_long;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -36,16 +36,10 @@ 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 string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
typedef struct grib_expression_string{
@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_string = {
"string", /* name */
sizeof(grib_expression_string),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_string = {
grib_expression_class* grib_expression_class_string = &_grib_expression_class_string;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)

View File

@ -38,16 +38,10 @@ 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*);
@ -64,7 +58,6 @@ static grib_expression_class _grib_expression_class_string_compare = {
"string_compare", /* name */
sizeof(grib_expression_string_compare),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -78,10 +71,6 @@ static grib_expression_class _grib_expression_class_string_compare = {
grib_expression_class* grib_expression_class_string_compare = &_grib_expression_class_string_compare;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
/* Note: A fast cut-down version of strcmp which does NOT return -1 */

View File

@ -36,16 +36,10 @@ 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 string evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
typedef struct grib_expression_sub_string{
@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_sub_string = {
"sub_string", /* name */
sizeof(grib_expression_sub_string),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_sub_string = {
grib_expression_class* grib_expression_class_sub_string = &_grib_expression_class_sub_string;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)

View File

@ -36,16 +36,10 @@ 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*);
@ -60,7 +54,6 @@ static grib_expression_class _grib_expression_class_true = {
"true", /* name */
sizeof(grib_expression_true),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -74,10 +67,6 @@ static grib_expression_class _grib_expression_class_true = {
grib_expression_class* grib_expression_class_true = &_grib_expression_class_true;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)

View File

@ -39,16 +39,10 @@ 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*);
@ -66,7 +60,6 @@ static grib_expression_class _grib_expression_class_unop = {
"unop", /* name */
sizeof(grib_expression_unop),/* size of instance */
0, /* inited */
&init_class, /* init_class */
0, /* constructor */
&destroy, /* destructor */
&print,
@ -80,10 +73,6 @@ static grib_expression_class _grib_expression_class_unop = {
grib_expression_class* grib_expression_class_unop = &_grib_expression_class_unop;
static void init_class(grib_expression_class* c)
{
}
/* END_CLASS_IMP */
static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)