From 97191cfb5034cbcc7c668b8a90f6134261238403 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 19 Mar 1998 20:43:47 +0000 Subject: [PATCH] get rid of some warning messages --- src/libCom/calc/postfix.c | 186 +++++++++++++++++----------------- src/libCom/cvtFast.c | 4 +- src/libCom/cvtFast/cvtFast.c | 4 +- src/libCom/errlogUNIX.c | 2 - src/libCom/gpHash/gpHashLib.c | 2 +- src/libCom/gpHashLib.c | 2 +- src/libCom/postfix.c | 186 +++++++++++++++++----------------- 7 files changed, 192 insertions(+), 194 deletions(-) diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c index 9f924932c..846bb41a0 100644 --- a/src/libCom/calc/postfix.c +++ b/src/libCom/calc/postfix.c @@ -154,101 +154,101 @@ struct expression_element{ */ static struct expression_element elements[] = { /* element i_s_p i_c_p type_element internal_rep */ -"ABS", 7, 8, UNARY_OPERATOR, ABS_VAL, /* absolute value */ -"NOT", 7, 8, UNARY_OPERATOR, UNARY_NEG, /* unary negate */ -"-", 7, 8, MINUS_OPERATOR, UNARY_NEG, /* unary negate (or binary op) */ -"SQRT", 7, 8, UNARY_OPERATOR, SQU_RT, /* square root */ -"SQR", 7, 8, UNARY_OPERATOR, SQU_RT, /* square root */ -"EXP", 7, 8, UNARY_OPERATOR, EXP, /* exponential function */ -"LOGE", 7, 8, UNARY_OPERATOR, LOG_E, /* log E */ -"LN", 7, 8, UNARY_OPERATOR, LOG_E, /* log E */ -"LOG", 7, 8, UNARY_OPERATOR, LOG_10, /* log 10 */ -"ACOS", 7, 8, UNARY_OPERATOR, ACOS, /* arc cosine */ -"ASIN", 7, 8, UNARY_OPERATOR, ASIN, /* arc sine */ -"ATAN2", 7, 8, UNARY_OPERATOR, ATAN2, /* arc tangent */ -"ATAN", 7, 8, UNARY_OPERATOR, ATAN, /* arc tangent */ -"MAX", 7, 8, UNARY_OPERATOR, MAX, /* maximum of 2 args */ -"MIN", 7, 8, UNARY_OPERATOR, MIN, /* minimum of 2 args */ -"CEIL", 7, 8, UNARY_OPERATOR, CEIL, /* smallest integer >= */ -"FLOOR", 7, 8, UNARY_OPERATOR, FLOOR, /* largest integer <= */ -"NINT", 7, 8, UNARY_OPERATOR, NINT, /* nearest integer */ -"COSH", 7, 8, UNARY_OPERATOR, COSH, /* hyperbolic cosine */ -"COS", 7, 8, UNARY_OPERATOR, COS, /* cosine */ -"SINH", 7, 8, UNARY_OPERATOR, SINH, /* hyperbolic sine */ -"SIN", 7, 8, UNARY_OPERATOR, SIN, /* sine */ -"TANH", 7, 8, UNARY_OPERATOR, TANH, /* hyperbolic tangent*/ -"TAN", 7, 8, UNARY_OPERATOR, TAN, /* tangent */ -"!", 7, 8, UNARY_OPERATOR, REL_NOT, /* not */ -"~", 7, 8, UNARY_OPERATOR, BIT_NOT, /* and */ -"RNDM", 0, 0, OPERAND, RANDOM, /* Random Number */ -"OR", 1, 1, BINARY_OPERATOR,BIT_OR, /* or */ -"AND", 2, 2, BINARY_OPERATOR,BIT_AND, /* and */ -"XOR", 1, 1, BINARY_OPERATOR,BIT_EXCL_OR, /* exclusive or */ -"PI", 0, 0, OPERAND, CONST_PI, /* pi */ -"D2R", 0, 0, OPERAND, CONST_D2R, /* pi/180 */ -"R2D", 0, 0, OPERAND, CONST_R2D, /* 180/pi */ -"A", 0, 0, OPERAND, FETCH_A, /* fetch var A */ -"B", 0, 0, OPERAND, FETCH_B, /* fetch var B */ -"C", 0, 0, OPERAND, FETCH_C, /* fetch var C */ -"D", 0, 0, OPERAND, FETCH_D, /* fetch var D */ -"E", 0, 0, OPERAND, FETCH_E, /* fetch var E */ -"F", 0, 0, OPERAND, FETCH_F, /* fetch var F */ -"G", 0, 0, OPERAND, FETCH_G, /* fetch var G */ -"H", 0, 0, OPERAND, FETCH_H, /* fetch var H */ -"I", 0, 0, OPERAND, FETCH_I, /* fetch var I */ -"J", 0, 0, OPERAND, FETCH_J, /* fetch var J */ -"K", 0, 0, OPERAND, FETCH_K, /* fetch var K */ -"L", 0, 0, OPERAND, FETCH_L, /* fetch var L */ -"a", 0, 0, OPERAND, FETCH_A, /* fetch var A */ -"b", 0, 0, OPERAND, FETCH_B, /* fetch var B */ -"c", 0, 0, OPERAND, FETCH_C, /* fetch var C */ -"d", 0, 0, OPERAND, FETCH_D, /* fetch var D */ -"e", 0, 0, OPERAND, FETCH_E, /* fetch var E */ -"f", 0, 0, OPERAND, FETCH_F, /* fetch var F */ -"g", 0, 0, OPERAND, FETCH_G, /* fetch var G */ -"h", 0, 0, OPERAND, FETCH_H, /* fetch var H */ -"i", 0, 0, OPERAND, FETCH_I, /* fetch var I */ -"j", 0, 0, OPERAND, FETCH_J, /* fetch var J */ -"k", 0, 0, OPERAND, FETCH_K, /* fetch var K */ -"l", 0, 0, OPERAND, FETCH_L, /* fetch var L */ -"0", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"1", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"2", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"3", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"4", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"5", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"6", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"7", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"8", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"9", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -".", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"?", 0, 0, CONDITIONAL, COND_IF, /* conditional */ -":", 0, 0, CONDITIONAL, COND_ELSE, /* else */ -"(", 0, 8, UNARY_OPERATOR, PAREN, /* open paren */ -"^", 6, 6, BINARY_OPERATOR,EXPON, /* exponentiation */ -"**", 6, 6, BINARY_OPERATOR,EXPON, /* exponentiation */ -"+", 4, 4, BINARY_OPERATOR,ADD, /* addition */ +{"ABS", 7, 8, UNARY_OPERATOR, ABS_VAL}, /* absolute value */ +{"NOT", 7, 8, UNARY_OPERATOR, UNARY_NEG}, /* unary negate */ +{"-", 7, 8, MINUS_OPERATOR, UNARY_NEG}, /* unary negate (or binary op) */ +{"SQRT", 7, 8, UNARY_OPERATOR, SQU_RT}, /* square root */ +{"SQR", 7, 8, UNARY_OPERATOR, SQU_RT}, /* square root */ +{"EXP", 7, 8, UNARY_OPERATOR, EXP}, /* exponential function */ +{"LOGE", 7, 8, UNARY_OPERATOR, LOG_E}, /* log E */ +{"LN", 7, 8, UNARY_OPERATOR, LOG_E}, /* log E */ +{"LOG", 7, 8, UNARY_OPERATOR, LOG_10}, /* log 10 */ +{"ACOS", 7, 8, UNARY_OPERATOR, ACOS}, /* arc cosine */ +{"ASIN", 7, 8, UNARY_OPERATOR, ASIN}, /* arc sine */ +{"ATAN2", 7, 8, UNARY_OPERATOR, ATAN2}, /* arc tangent */ +{"ATAN", 7, 8, UNARY_OPERATOR, ATAN}, /* arc tangent */ +{"MAX", 7, 8, UNARY_OPERATOR, MAX}, /* maximum of 2 args */ +{"MIN", 7, 8, UNARY_OPERATOR, MIN}, /* minimum of 2 args */ +{"CEIL", 7, 8, UNARY_OPERATOR, CEIL}, /* smallest integer >= */ +{"FLOOR", 7, 8, UNARY_OPERATOR, FLOOR}, /* largest integer <= */ +{"NINT", 7, 8, UNARY_OPERATOR, NINT}, /* nearest integer */ +{"COSH", 7, 8, UNARY_OPERATOR, COSH}, /* hyperbolic cosine */ +{"COS", 7, 8, UNARY_OPERATOR, COS}, /* cosine */ +{"SINH", 7, 8, UNARY_OPERATOR, SINH}, /* hyperbolic sine */ +{"SIN", 7, 8, UNARY_OPERATOR, SIN}, /* sine */ +{"TANH", 7, 8, UNARY_OPERATOR, TANH}, /* hyperbolic tangent*/ +{"TAN", 7, 8, UNARY_OPERATOR, TAN}, /* tangent */ +{"!", 7, 8, UNARY_OPERATOR, REL_NOT}, /* not */ +{"~", 7, 8, UNARY_OPERATOR, BIT_NOT}, /* and */ +{"RNDM", 0, 0, OPERAND, RANDOM}, /* Random Number */ +{"OR", 1, 1, BINARY_OPERATOR,BIT_OR}, /* or */ +{"AND", 2, 2, BINARY_OPERATOR,BIT_AND}, /* and */ +{"XOR", 1, 1, BINARY_OPERATOR,BIT_EXCL_OR}, /* exclusive or */ +{"PI", 0, 0, OPERAND, CONST_PI}, /* pi */ +{"D2R", 0, 0, OPERAND, CONST_D2R}, /* pi/180 */ +{"R2D", 0, 0, OPERAND, CONST_R2D}, /* 180/pi */ +{"A", 0, 0, OPERAND, FETCH_A}, /* fetch var A */ +{"B", 0, 0, OPERAND, FETCH_B}, /* fetch var B */ +{"C", 0, 0, OPERAND, FETCH_C}, /* fetch var C */ +{"D", 0, 0, OPERAND, FETCH_D}, /* fetch var D */ +{"E", 0, 0, OPERAND, FETCH_E}, /* fetch var E */ +{"F", 0, 0, OPERAND, FETCH_F}, /* fetch var F */ +{"G", 0, 0, OPERAND, FETCH_G}, /* fetch var G */ +{"H", 0, 0, OPERAND, FETCH_H}, /* fetch var H */ +{"I", 0, 0, OPERAND, FETCH_I}, /* fetch var I */ +{"J", 0, 0, OPERAND, FETCH_J}, /* fetch var J */ +{"K", 0, 0, OPERAND, FETCH_K}, /* fetch var K */ +{"L", 0, 0, OPERAND, FETCH_L}, /* fetch var L */ +{"a", 0, 0, OPERAND, FETCH_A}, /* fetch var A */ +{"b", 0, 0, OPERAND, FETCH_B}, /* fetch var B */ +{"c", 0, 0, OPERAND, FETCH_C}, /* fetch var C */ +{"d", 0, 0, OPERAND, FETCH_D}, /* fetch var D */ +{"e", 0, 0, OPERAND, FETCH_E}, /* fetch var E */ +{"f", 0, 0, OPERAND, FETCH_F}, /* fetch var F */ +{"g", 0, 0, OPERAND, FETCH_G}, /* fetch var G */ +{"h", 0, 0, OPERAND, FETCH_H}, /* fetch var H */ +{"i", 0, 0, OPERAND, FETCH_I}, /* fetch var I */ +{"j", 0, 0, OPERAND, FETCH_J}, /* fetch var J */ +{"k", 0, 0, OPERAND, FETCH_K}, /* fetch var K */ +{"l", 0, 0, OPERAND, FETCH_L}, /* fetch var L */ +{"0", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"1", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"2", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"3", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"4", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"5", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"6", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"7", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"8", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"9", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{".", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"?", 0, 0, CONDITIONAL, COND_IF}, /* conditional */ +{":", 0, 0, CONDITIONAL, COND_ELSE}, /* else */ +{"(", 0, 8, UNARY_OPERATOR, PAREN}, /* open paren */ +{"^", 6, 6, BINARY_OPERATOR,EXPON}, /* exponentiation */ +{"**", 6, 6, BINARY_OPERATOR,EXPON}, /* exponentiation */ +{"+", 4, 4, BINARY_OPERATOR,ADD}, /* addition */ #if 0 -"-", 4, 4, BINARY_OPERATOR,SUB, /* subtraction */ +{"-", 4, 4, BINARY_OPERATOR,SUB}, /* subtraction */ #endif -"*", 5, 5, BINARY_OPERATOR,MULT, /* multiplication */ -"/", 5, 5, BINARY_OPERATOR,DIV, /* division */ -"%", 5, 5, BINARY_OPERATOR,MODULO, /* modulo */ -",", 0, 0, SEPERATOR, COMMA, /* comma */ -")", 0, 0, CLOSE_PAREN, PAREN, /* close paren */ -"||", 1, 1, BINARY_OPERATOR,REL_OR, /* or */ -"|", 1, 1, BINARY_OPERATOR,BIT_OR, /* or */ -"&&", 2, 2, BINARY_OPERATOR,REL_AND, /* and */ -"&", 2, 2, BINARY_OPERATOR,BIT_AND, /* and */ -">>", 2, 2, BINARY_OPERATOR,RIGHT_SHIFT, /* right shift */ -">=", 3, 3, BINARY_OPERATOR,GR_OR_EQ, /* greater or equal*/ -">", 3, 3, BINARY_OPERATOR,GR_THAN, /* greater than */ -"<<", 2, 2, BINARY_OPERATOR,LEFT_SHIFT, /* left shift */ -"<=", 3, 3, BINARY_OPERATOR,LESS_OR_EQ,/* less or equal to*/ -"<", 3, 3, BINARY_OPERATOR,LESS_THAN, /* less than */ -"#", 3, 3, BINARY_OPERATOR,NOT_EQ, /* not equal */ -"=", 3, 3, BINARY_OPERATOR,EQUAL, /* equal */ -"" +{"*", 5, 5, BINARY_OPERATOR,MULT}, /* multiplication */ +{"/", 5, 5, BINARY_OPERATOR,DIV}, /* division */ +{"%", 5, 5, BINARY_OPERATOR,MODULO}, /* modulo */ +{",", 0, 0, SEPERATOR, COMMA}, /* comma */ +{")", 0, 0, CLOSE_PAREN, PAREN}, /* close paren */ +{"||", 1, 1, BINARY_OPERATOR,REL_OR}, /* or */ +{"|", 1, 1, BINARY_OPERATOR,BIT_OR}, /* or */ +{"&&", 2, 2, BINARY_OPERATOR,REL_AND}, /* and */ +{"&", 2, 2, BINARY_OPERATOR,BIT_AND}, /* and */ +{">>", 2, 2, BINARY_OPERATOR,RIGHT_SHIFT}, /* right shift */ +{">=", 3, 3, BINARY_OPERATOR,GR_OR_EQ}, /* greater or equal*/ +{">", 3, 3, BINARY_OPERATOR,GR_THAN}, /* greater than */ +{"<<", 2, 2, BINARY_OPERATOR,LEFT_SHIFT}, /* left shift */ +{"<=", 3, 3, BINARY_OPERATOR,LESS_OR_EQ},/* less or equal to*/ +{"<", 3, 3, BINARY_OPERATOR,LESS_THAN}, /* less than */ +{"#", 3, 3, BINARY_OPERATOR,NOT_EQ}, /* not equal */ +{"=", 3, 3, BINARY_OPERATOR,EQUAL}, /* equal */ +{""} }; /* diff --git a/src/libCom/cvtFast.c b/src/libCom/cvtFast.c index a34365f37..b753c7523 100644 --- a/src/libCom/cvtFast.c +++ b/src/libCom/cvtFast.c @@ -513,7 +513,7 @@ int epicsShareAPI cvtLongToHexString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"%x",LONG_MIN); + sprintf(pdest,"%lx",LONG_MIN); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -549,7 +549,7 @@ int epicsShareAPI cvtLongToOctalString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"%o",LONG_MIN); + sprintf(pdest,"%lo",LONG_MIN); return((int)strlen(pdest)); } *pdest++ = '-'; diff --git a/src/libCom/cvtFast/cvtFast.c b/src/libCom/cvtFast/cvtFast.c index a34365f37..b753c7523 100644 --- a/src/libCom/cvtFast/cvtFast.c +++ b/src/libCom/cvtFast/cvtFast.c @@ -513,7 +513,7 @@ int epicsShareAPI cvtLongToHexString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"%x",LONG_MIN); + sprintf(pdest,"%lx",LONG_MIN); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -549,7 +549,7 @@ int epicsShareAPI cvtLongToOctalString( } if(source<0) { if(source == LONG_MIN) { - sprintf(pdest,"%o",LONG_MIN); + sprintf(pdest,"%lo",LONG_MIN); return((int)strlen(pdest)); } *pdest++ = '-'; diff --git a/src/libCom/errlogUNIX.c b/src/libCom/errlogUNIX.c index ca7ee1fbc..9cb042a64 100644 --- a/src/libCom/errlogUNIX.c +++ b/src/libCom/errlogUNIX.c @@ -89,9 +89,7 @@ epicsShareFunc int epicsShareAPIV errlogSevPrintf( epicsShareFunc int epicsShareAPIV errlogSevVprintf( const errlogSevEnum severity,const char *pformat,va_list pvar) { - char *pnext; int nchar; - int totalChar=0; if(sevToLog>severity) return(0); fprintf(stderr,"sevr=%s ",errlogGetSevEnumString(severity)); diff --git a/src/libCom/gpHash/gpHashLib.c b/src/libCom/gpHash/gpHashLib.c index dd6e1355c..1388f6e9f 100644 --- a/src/libCom/gpHash/gpHashLib.c +++ b/src/libCom/gpHash/gpHashLib.c @@ -239,7 +239,7 @@ void epicsShareAPI gphDelete(void *pvt,char *name,void *pvtid) int hashInd; gphPvt *pgphPvt = (gphPvt *)pvt; ELLLIST **paplist; - ELLLIST *plist; + ELLLIST *plist = NULL; GPHENTRY *pgphNode; if(pgphPvt==NULL) return; diff --git a/src/libCom/gpHashLib.c b/src/libCom/gpHashLib.c index dd6e1355c..1388f6e9f 100644 --- a/src/libCom/gpHashLib.c +++ b/src/libCom/gpHashLib.c @@ -239,7 +239,7 @@ void epicsShareAPI gphDelete(void *pvt,char *name,void *pvtid) int hashInd; gphPvt *pgphPvt = (gphPvt *)pvt; ELLLIST **paplist; - ELLLIST *plist; + ELLLIST *plist = NULL; GPHENTRY *pgphNode; if(pgphPvt==NULL) return; diff --git a/src/libCom/postfix.c b/src/libCom/postfix.c index 9f924932c..846bb41a0 100644 --- a/src/libCom/postfix.c +++ b/src/libCom/postfix.c @@ -154,101 +154,101 @@ struct expression_element{ */ static struct expression_element elements[] = { /* element i_s_p i_c_p type_element internal_rep */ -"ABS", 7, 8, UNARY_OPERATOR, ABS_VAL, /* absolute value */ -"NOT", 7, 8, UNARY_OPERATOR, UNARY_NEG, /* unary negate */ -"-", 7, 8, MINUS_OPERATOR, UNARY_NEG, /* unary negate (or binary op) */ -"SQRT", 7, 8, UNARY_OPERATOR, SQU_RT, /* square root */ -"SQR", 7, 8, UNARY_OPERATOR, SQU_RT, /* square root */ -"EXP", 7, 8, UNARY_OPERATOR, EXP, /* exponential function */ -"LOGE", 7, 8, UNARY_OPERATOR, LOG_E, /* log E */ -"LN", 7, 8, UNARY_OPERATOR, LOG_E, /* log E */ -"LOG", 7, 8, UNARY_OPERATOR, LOG_10, /* log 10 */ -"ACOS", 7, 8, UNARY_OPERATOR, ACOS, /* arc cosine */ -"ASIN", 7, 8, UNARY_OPERATOR, ASIN, /* arc sine */ -"ATAN2", 7, 8, UNARY_OPERATOR, ATAN2, /* arc tangent */ -"ATAN", 7, 8, UNARY_OPERATOR, ATAN, /* arc tangent */ -"MAX", 7, 8, UNARY_OPERATOR, MAX, /* maximum of 2 args */ -"MIN", 7, 8, UNARY_OPERATOR, MIN, /* minimum of 2 args */ -"CEIL", 7, 8, UNARY_OPERATOR, CEIL, /* smallest integer >= */ -"FLOOR", 7, 8, UNARY_OPERATOR, FLOOR, /* largest integer <= */ -"NINT", 7, 8, UNARY_OPERATOR, NINT, /* nearest integer */ -"COSH", 7, 8, UNARY_OPERATOR, COSH, /* hyperbolic cosine */ -"COS", 7, 8, UNARY_OPERATOR, COS, /* cosine */ -"SINH", 7, 8, UNARY_OPERATOR, SINH, /* hyperbolic sine */ -"SIN", 7, 8, UNARY_OPERATOR, SIN, /* sine */ -"TANH", 7, 8, UNARY_OPERATOR, TANH, /* hyperbolic tangent*/ -"TAN", 7, 8, UNARY_OPERATOR, TAN, /* tangent */ -"!", 7, 8, UNARY_OPERATOR, REL_NOT, /* not */ -"~", 7, 8, UNARY_OPERATOR, BIT_NOT, /* and */ -"RNDM", 0, 0, OPERAND, RANDOM, /* Random Number */ -"OR", 1, 1, BINARY_OPERATOR,BIT_OR, /* or */ -"AND", 2, 2, BINARY_OPERATOR,BIT_AND, /* and */ -"XOR", 1, 1, BINARY_OPERATOR,BIT_EXCL_OR, /* exclusive or */ -"PI", 0, 0, OPERAND, CONST_PI, /* pi */ -"D2R", 0, 0, OPERAND, CONST_D2R, /* pi/180 */ -"R2D", 0, 0, OPERAND, CONST_R2D, /* 180/pi */ -"A", 0, 0, OPERAND, FETCH_A, /* fetch var A */ -"B", 0, 0, OPERAND, FETCH_B, /* fetch var B */ -"C", 0, 0, OPERAND, FETCH_C, /* fetch var C */ -"D", 0, 0, OPERAND, FETCH_D, /* fetch var D */ -"E", 0, 0, OPERAND, FETCH_E, /* fetch var E */ -"F", 0, 0, OPERAND, FETCH_F, /* fetch var F */ -"G", 0, 0, OPERAND, FETCH_G, /* fetch var G */ -"H", 0, 0, OPERAND, FETCH_H, /* fetch var H */ -"I", 0, 0, OPERAND, FETCH_I, /* fetch var I */ -"J", 0, 0, OPERAND, FETCH_J, /* fetch var J */ -"K", 0, 0, OPERAND, FETCH_K, /* fetch var K */ -"L", 0, 0, OPERAND, FETCH_L, /* fetch var L */ -"a", 0, 0, OPERAND, FETCH_A, /* fetch var A */ -"b", 0, 0, OPERAND, FETCH_B, /* fetch var B */ -"c", 0, 0, OPERAND, FETCH_C, /* fetch var C */ -"d", 0, 0, OPERAND, FETCH_D, /* fetch var D */ -"e", 0, 0, OPERAND, FETCH_E, /* fetch var E */ -"f", 0, 0, OPERAND, FETCH_F, /* fetch var F */ -"g", 0, 0, OPERAND, FETCH_G, /* fetch var G */ -"h", 0, 0, OPERAND, FETCH_H, /* fetch var H */ -"i", 0, 0, OPERAND, FETCH_I, /* fetch var I */ -"j", 0, 0, OPERAND, FETCH_J, /* fetch var J */ -"k", 0, 0, OPERAND, FETCH_K, /* fetch var K */ -"l", 0, 0, OPERAND, FETCH_L, /* fetch var L */ -"0", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"1", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"2", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"3", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"4", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"5", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"6", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"7", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"8", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"9", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -".", 0, 0, FLOAT_PT_CONST, CONSTANT, /* flt pt constant */ -"?", 0, 0, CONDITIONAL, COND_IF, /* conditional */ -":", 0, 0, CONDITIONAL, COND_ELSE, /* else */ -"(", 0, 8, UNARY_OPERATOR, PAREN, /* open paren */ -"^", 6, 6, BINARY_OPERATOR,EXPON, /* exponentiation */ -"**", 6, 6, BINARY_OPERATOR,EXPON, /* exponentiation */ -"+", 4, 4, BINARY_OPERATOR,ADD, /* addition */ +{"ABS", 7, 8, UNARY_OPERATOR, ABS_VAL}, /* absolute value */ +{"NOT", 7, 8, UNARY_OPERATOR, UNARY_NEG}, /* unary negate */ +{"-", 7, 8, MINUS_OPERATOR, UNARY_NEG}, /* unary negate (or binary op) */ +{"SQRT", 7, 8, UNARY_OPERATOR, SQU_RT}, /* square root */ +{"SQR", 7, 8, UNARY_OPERATOR, SQU_RT}, /* square root */ +{"EXP", 7, 8, UNARY_OPERATOR, EXP}, /* exponential function */ +{"LOGE", 7, 8, UNARY_OPERATOR, LOG_E}, /* log E */ +{"LN", 7, 8, UNARY_OPERATOR, LOG_E}, /* log E */ +{"LOG", 7, 8, UNARY_OPERATOR, LOG_10}, /* log 10 */ +{"ACOS", 7, 8, UNARY_OPERATOR, ACOS}, /* arc cosine */ +{"ASIN", 7, 8, UNARY_OPERATOR, ASIN}, /* arc sine */ +{"ATAN2", 7, 8, UNARY_OPERATOR, ATAN2}, /* arc tangent */ +{"ATAN", 7, 8, UNARY_OPERATOR, ATAN}, /* arc tangent */ +{"MAX", 7, 8, UNARY_OPERATOR, MAX}, /* maximum of 2 args */ +{"MIN", 7, 8, UNARY_OPERATOR, MIN}, /* minimum of 2 args */ +{"CEIL", 7, 8, UNARY_OPERATOR, CEIL}, /* smallest integer >= */ +{"FLOOR", 7, 8, UNARY_OPERATOR, FLOOR}, /* largest integer <= */ +{"NINT", 7, 8, UNARY_OPERATOR, NINT}, /* nearest integer */ +{"COSH", 7, 8, UNARY_OPERATOR, COSH}, /* hyperbolic cosine */ +{"COS", 7, 8, UNARY_OPERATOR, COS}, /* cosine */ +{"SINH", 7, 8, UNARY_OPERATOR, SINH}, /* hyperbolic sine */ +{"SIN", 7, 8, UNARY_OPERATOR, SIN}, /* sine */ +{"TANH", 7, 8, UNARY_OPERATOR, TANH}, /* hyperbolic tangent*/ +{"TAN", 7, 8, UNARY_OPERATOR, TAN}, /* tangent */ +{"!", 7, 8, UNARY_OPERATOR, REL_NOT}, /* not */ +{"~", 7, 8, UNARY_OPERATOR, BIT_NOT}, /* and */ +{"RNDM", 0, 0, OPERAND, RANDOM}, /* Random Number */ +{"OR", 1, 1, BINARY_OPERATOR,BIT_OR}, /* or */ +{"AND", 2, 2, BINARY_OPERATOR,BIT_AND}, /* and */ +{"XOR", 1, 1, BINARY_OPERATOR,BIT_EXCL_OR}, /* exclusive or */ +{"PI", 0, 0, OPERAND, CONST_PI}, /* pi */ +{"D2R", 0, 0, OPERAND, CONST_D2R}, /* pi/180 */ +{"R2D", 0, 0, OPERAND, CONST_R2D}, /* 180/pi */ +{"A", 0, 0, OPERAND, FETCH_A}, /* fetch var A */ +{"B", 0, 0, OPERAND, FETCH_B}, /* fetch var B */ +{"C", 0, 0, OPERAND, FETCH_C}, /* fetch var C */ +{"D", 0, 0, OPERAND, FETCH_D}, /* fetch var D */ +{"E", 0, 0, OPERAND, FETCH_E}, /* fetch var E */ +{"F", 0, 0, OPERAND, FETCH_F}, /* fetch var F */ +{"G", 0, 0, OPERAND, FETCH_G}, /* fetch var G */ +{"H", 0, 0, OPERAND, FETCH_H}, /* fetch var H */ +{"I", 0, 0, OPERAND, FETCH_I}, /* fetch var I */ +{"J", 0, 0, OPERAND, FETCH_J}, /* fetch var J */ +{"K", 0, 0, OPERAND, FETCH_K}, /* fetch var K */ +{"L", 0, 0, OPERAND, FETCH_L}, /* fetch var L */ +{"a", 0, 0, OPERAND, FETCH_A}, /* fetch var A */ +{"b", 0, 0, OPERAND, FETCH_B}, /* fetch var B */ +{"c", 0, 0, OPERAND, FETCH_C}, /* fetch var C */ +{"d", 0, 0, OPERAND, FETCH_D}, /* fetch var D */ +{"e", 0, 0, OPERAND, FETCH_E}, /* fetch var E */ +{"f", 0, 0, OPERAND, FETCH_F}, /* fetch var F */ +{"g", 0, 0, OPERAND, FETCH_G}, /* fetch var G */ +{"h", 0, 0, OPERAND, FETCH_H}, /* fetch var H */ +{"i", 0, 0, OPERAND, FETCH_I}, /* fetch var I */ +{"j", 0, 0, OPERAND, FETCH_J}, /* fetch var J */ +{"k", 0, 0, OPERAND, FETCH_K}, /* fetch var K */ +{"l", 0, 0, OPERAND, FETCH_L}, /* fetch var L */ +{"0", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"1", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"2", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"3", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"4", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"5", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"6", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"7", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"8", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"9", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{".", 0, 0, FLOAT_PT_CONST, CONSTANT}, /* flt pt constant */ +{"?", 0, 0, CONDITIONAL, COND_IF}, /* conditional */ +{":", 0, 0, CONDITIONAL, COND_ELSE}, /* else */ +{"(", 0, 8, UNARY_OPERATOR, PAREN}, /* open paren */ +{"^", 6, 6, BINARY_OPERATOR,EXPON}, /* exponentiation */ +{"**", 6, 6, BINARY_OPERATOR,EXPON}, /* exponentiation */ +{"+", 4, 4, BINARY_OPERATOR,ADD}, /* addition */ #if 0 -"-", 4, 4, BINARY_OPERATOR,SUB, /* subtraction */ +{"-", 4, 4, BINARY_OPERATOR,SUB}, /* subtraction */ #endif -"*", 5, 5, BINARY_OPERATOR,MULT, /* multiplication */ -"/", 5, 5, BINARY_OPERATOR,DIV, /* division */ -"%", 5, 5, BINARY_OPERATOR,MODULO, /* modulo */ -",", 0, 0, SEPERATOR, COMMA, /* comma */ -")", 0, 0, CLOSE_PAREN, PAREN, /* close paren */ -"||", 1, 1, BINARY_OPERATOR,REL_OR, /* or */ -"|", 1, 1, BINARY_OPERATOR,BIT_OR, /* or */ -"&&", 2, 2, BINARY_OPERATOR,REL_AND, /* and */ -"&", 2, 2, BINARY_OPERATOR,BIT_AND, /* and */ -">>", 2, 2, BINARY_OPERATOR,RIGHT_SHIFT, /* right shift */ -">=", 3, 3, BINARY_OPERATOR,GR_OR_EQ, /* greater or equal*/ -">", 3, 3, BINARY_OPERATOR,GR_THAN, /* greater than */ -"<<", 2, 2, BINARY_OPERATOR,LEFT_SHIFT, /* left shift */ -"<=", 3, 3, BINARY_OPERATOR,LESS_OR_EQ,/* less or equal to*/ -"<", 3, 3, BINARY_OPERATOR,LESS_THAN, /* less than */ -"#", 3, 3, BINARY_OPERATOR,NOT_EQ, /* not equal */ -"=", 3, 3, BINARY_OPERATOR,EQUAL, /* equal */ -"" +{"*", 5, 5, BINARY_OPERATOR,MULT}, /* multiplication */ +{"/", 5, 5, BINARY_OPERATOR,DIV}, /* division */ +{"%", 5, 5, BINARY_OPERATOR,MODULO}, /* modulo */ +{",", 0, 0, SEPERATOR, COMMA}, /* comma */ +{")", 0, 0, CLOSE_PAREN, PAREN}, /* close paren */ +{"||", 1, 1, BINARY_OPERATOR,REL_OR}, /* or */ +{"|", 1, 1, BINARY_OPERATOR,BIT_OR}, /* or */ +{"&&", 2, 2, BINARY_OPERATOR,REL_AND}, /* and */ +{"&", 2, 2, BINARY_OPERATOR,BIT_AND}, /* and */ +{">>", 2, 2, BINARY_OPERATOR,RIGHT_SHIFT}, /* right shift */ +{">=", 3, 3, BINARY_OPERATOR,GR_OR_EQ}, /* greater or equal*/ +{">", 3, 3, BINARY_OPERATOR,GR_THAN}, /* greater than */ +{"<<", 2, 2, BINARY_OPERATOR,LEFT_SHIFT}, /* left shift */ +{"<=", 3, 3, BINARY_OPERATOR,LESS_OR_EQ},/* less or equal to*/ +{"<", 3, 3, BINARY_OPERATOR,LESS_THAN}, /* less than */ +{"#", 3, 3, BINARY_OPERATOR,NOT_EQ}, /* not equal */ +{"=", 3, 3, BINARY_OPERATOR,EQUAL}, /* equal */ +{""} }; /*