epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

added MAX and MIN and multiple cond expressions

Browse Source
This commit is contained in:
Janet B. Anderson
1992-03-17 17:28:20 +00:00
parent 93e5b06ff0
commit 233d07d8bc
5 changed files with 184 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/calc/calcPerform.c
+38 -32
View File
@@ -60,6 +60,9 @@
* .24 02-20-92 rcz fixed for vxWorks build
* .25 02-24-92 jba add EXP and fix for EXPON when *pstacktop is 0
* .26 02-28-92 jba added CEIL and FLOOR
* .27 03-06-92 jba added MAX and MIN binary functions
* .28 03-10-92 jba added multiple conditional expressions ?
>
*/
/* This module contains the code for processing the arithmetic
@@ -115,6 +118,7 @@ char *post;
int itop; /* integer top value */
int inexttop; /* ineteger next to top value */
short cond_flag; /* conditional else flag */
short got_if;
/* initialize flag */
cond_flag = NOT_SET;
@@ -211,41 +215,31 @@ char *post;
*pstacktop = *pstacktop / *(pstacktop+1);
break;
case COND_ELSE:
/* first conditional set cond_flag */
/* true */
if ((*pstacktop != 0.0) && (cond_flag == NOT_SET)){
cond_flag = TRUE_COND;
--pstacktop; /* remove condition */
/* false */
}else if ((*pstacktop==0.0) && (cond_flag==NOT_SET)){
cond_flag = FALSE_COND;
--pstacktop; /* remove condition */
/* check for else condition */
i = 1;
while (*(post+i) != COND_ELSE){
/* no else value */
if (*(post+i) == END_STACK){
/* skip to end of expression */
while (*(post+1) != END_STACK)
++post;
/* use last value as result */
++pstacktop;
*pstacktop = *presult;
}
i++;
case COND_IF:
/* if false condition then skip true expression */
if (*pstacktop == 0.0) {
/* skip to matching COND_ELSE */
for (got_if=1; got_if>0 && *(post+1) != END_STACK; ++post) {
if (*(post+1) == COND_IF ) got_if++;
if (*(post+1) == COND_ELSE) got_if--;
}
}else if (cond_flag == TRUE_COND){
/* skip expression - result is on stack */
while ((*(post+1) != COND_ELSE)
&& (*(post+1) != END_STACK))
++post;
}else if (cond_flag == FALSE_COND){
/* remove true answer from stack top */
--pstacktop;
}
/* remove condition from stack top */
--pstacktop;
break;
case COND_ELSE:
/* result, true condition is on stack so skip false condition */
/* skip to matching COND_END */
for (got_if=1; got_if>0 && *(post+1) != END_STACK; ++post) {
if (*(post+1) == COND_IF ) got_if++;
if (*(post+1) == COND_END) got_if--;
}
break;
case COND_END:
break;
case ABS_VAL:
if (*pstacktop < 0) *pstacktop = -*pstacktop;
break;
@@ -379,6 +373,19 @@ char *post;
*pstacktop = (inexttop << itop);
break;
case MAX:
--pstacktop;
if (*pstacktop < *(pstacktop+1))
*pstacktop = *(pstacktop+1);
break;
case MIN:
--pstacktop;
if (*pstacktop > *(pstacktop+1))
*pstacktop = *(pstacktop+1);
break;
case ACOS:
*pstacktop = acos(*pstacktop);
break;
@@ -473,4 +480,3 @@ static double random()
/* between 0 - 1 */
return(randy);
}
src/libCom/calc/postfix.c
+50 -24
View File
@@ -36,6 +36,8 @@
* .05 11-26-90 lrd fix SINH, COSH, TANH
* .06 02-20-92 rcz fixed for vxWorks build
* .07 02-24-92 jba add EXP and fixed trailing blanks in expression
* .08 03-03-92 jba added MAX and MIN and comma(like close paren)
* .09 03-06-92 jba added multiple conditional expressions ?
*/
/*
@@ -100,7 +102,9 @@
#define CLOSE_PAREN 5
#define CONDITIONAL 6
#define ELSE 7
#define TRASH 8
#define SEPERATOR 8
#define TRASH 9
/* flags end of element table */
#define END_ELEMENTS -1
@@ -146,6 +150,8 @@ static struct expression_element elements[] = {
"ACOS", 7, 8, UNARY_OPERATOR, ACOS, /* arc cosine */
"ASIN", 7, 8, UNARY_OPERATOR, ASIN, /* arc sine */
"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 <= */
"COSH", 7, 8, UNARY_OPERATOR, COSH, /* hyperbolic cosine */
@@ -184,9 +190,9 @@ static struct expression_element elements[] = {
"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, CONDITIONAL, COND_ELSE, /* conditional */
":", 0, 0, ELSE, COND_ELSE, /* else */
"(", 0, 8, UNARY_OPERATOR, PAREN, /* open paren */
"?", 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 */
@@ -194,6 +200,7 @@ static struct expression_element elements[] = {
"*", 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 */
@@ -271,8 +278,6 @@ register char *pinfix;
register char *ppostfix;
short *perror;
{
short got_if;
short got_else;
short no_bytes;
register short operand_needed;
register short new_expression;
@@ -282,8 +287,6 @@ short *perror;
register struct expression_element *pstacktop;
/* place the expression elements into postfix */
got_if = FALSE;
got_else = FALSE;
operand_needed = TRUE;
new_expression = TRUE;
pstacktop = &stack[0];
@@ -347,6 +350,24 @@ short *perror;
new_expression = FALSE;
break;
case SEPERATOR:
if (operand_needed){
*perror = 4;
return(-1);
}
/* add operators to postfix until open paren */
while (pstacktop->element[0] != '('){
if (pstacktop == &stack[1]){
*perror = 6;
return(-1);
}
*ppostfix++ = pstacktop->code;
pstacktop--;
}
operand_needed = TRUE;
break;
case CLOSE_PAREN:
if (operand_needed){
*perror = 4;
@@ -365,28 +386,33 @@ short *perror;
pstacktop--; /* remove ( from stack */
break;
/* conditional includes expression termination */
case CONDITIONAL:
if (got_if){
*perror = 9;
if (operand_needed){
*perror = 4;
return(-1);
}
got_if = TRUE;
/* else includes expression termination */
case ELSE:
if (pelement->type == ELSE){
if (!got_if){
*perror = 11;
return(-1);
}
if (got_else){
*perror = 10;
return(-1);
}
got_else = TRUE;
/* add operators of higher priority to */
/* postfix notation */
while ((pstacktop->in_stack_pri > pelement->in_coming_pri)
&& (pstacktop >= &stack[1])){
*ppostfix++ = pstacktop->code;
pstacktop--;
}
/* add new element to the postfix expression */
*ppostfix++ = pelement->code;
/* add : operator with COND_END code to stack */
if (pelement->element[0] == ':'){
pstacktop++;
*pstacktop = *pelement;
pstacktop->code = COND_END;
}
operand_needed = TRUE;
break;
case EXPR_TERM:
if (operand_needed && !new_expression){
*perror = 4;
src/libCom/calcPerform.c
+38 -32
View File
@@ -60,6 +60,9 @@
* .24 02-20-92 rcz fixed for vxWorks build
* .25 02-24-92 jba add EXP and fix for EXPON when *pstacktop is 0
* .26 02-28-92 jba added CEIL and FLOOR
* .27 03-06-92 jba added MAX and MIN binary functions
* .28 03-10-92 jba added multiple conditional expressions ?
>
*/
/* This module contains the code for processing the arithmetic
@@ -115,6 +118,7 @@ char *post;
int itop; /* integer top value */
int inexttop; /* ineteger next to top value */
short cond_flag; /* conditional else flag */
short got_if;
/* initialize flag */
cond_flag = NOT_SET;
@@ -211,41 +215,31 @@ char *post;
*pstacktop = *pstacktop / *(pstacktop+1);
break;
case COND_ELSE:
/* first conditional set cond_flag */
/* true */
if ((*pstacktop != 0.0) && (cond_flag == NOT_SET)){
cond_flag = TRUE_COND;
--pstacktop; /* remove condition */
/* false */
}else if ((*pstacktop==0.0) && (cond_flag==NOT_SET)){
cond_flag = FALSE_COND;
--pstacktop; /* remove condition */
/* check for else condition */
i = 1;
while (*(post+i) != COND_ELSE){
/* no else value */
if (*(post+i) == END_STACK){
/* skip to end of expression */
while (*(post+1) != END_STACK)
++post;
/* use last value as result */
++pstacktop;
*pstacktop = *presult;
}
i++;
case COND_IF:
/* if false condition then skip true expression */
if (*pstacktop == 0.0) {
/* skip to matching COND_ELSE */
for (got_if=1; got_if>0 && *(post+1) != END_STACK; ++post) {
if (*(post+1) == COND_IF ) got_if++;
if (*(post+1) == COND_ELSE) got_if--;
}
}else if (cond_flag == TRUE_COND){
/* skip expression - result is on stack */
while ((*(post+1) != COND_ELSE)
&& (*(post+1) != END_STACK))
++post;
}else if (cond_flag == FALSE_COND){
/* remove true answer from stack top */
--pstacktop;
}
/* remove condition from stack top */
--pstacktop;
break;
case COND_ELSE:
/* result, true condition is on stack so skip false condition */
/* skip to matching COND_END */
for (got_if=1; got_if>0 && *(post+1) != END_STACK; ++post) {
if (*(post+1) == COND_IF ) got_if++;
if (*(post+1) == COND_END) got_if--;
}
break;
case COND_END:
break;
case ABS_VAL:
if (*pstacktop < 0) *pstacktop = -*pstacktop;
break;
@@ -379,6 +373,19 @@ char *post;
*pstacktop = (inexttop << itop);
break;
case MAX:
--pstacktop;
if (*pstacktop < *(pstacktop+1))
*pstacktop = *(pstacktop+1);
break;
case MIN:
--pstacktop;
if (*pstacktop > *(pstacktop+1))
*pstacktop = *(pstacktop+1);
break;
case ACOS:
*pstacktop = acos(*pstacktop);
break;
@@ -473,4 +480,3 @@ static double random()
/* between 0 - 1 */
return(randy);
}
src/libCom/post.h
+8 -1
View File
@@ -29,7 +29,9 @@
* -----------------
* .01 01-11-89 lrd add right and left shift
* .02 02-01-89 lrd add trig functions
* .03 02-17-92 jba add exp
* .03 02-17-92 jba add exp, CEIL, and FLOOR
* .04 03-03-92 jba added MAX, MIN, and comma
* .05 03-06-92 jba added multiple conditional expressions ?
*/
/* defines for element table */
@@ -99,4 +101,9 @@
#define REL_NOT 63
#define BIT_NOT 64
#define PAREN 65
#define MAX 66
#define MIN 67
#define COMMA 68
#define COND_IF 69
#define COND_END 70
#define END_STACK -1
src/libCom/postfix.c
+50 -24
View File
@@ -36,6 +36,8 @@
* .05 11-26-90 lrd fix SINH, COSH, TANH
* .06 02-20-92 rcz fixed for vxWorks build
* .07 02-24-92 jba add EXP and fixed trailing blanks in expression
* .08 03-03-92 jba added MAX and MIN and comma(like close paren)
* .09 03-06-92 jba added multiple conditional expressions ?
*/
/*
@@ -100,7 +102,9 @@
#define CLOSE_PAREN 5
#define CONDITIONAL 6
#define ELSE 7
#define TRASH 8
#define SEPERATOR 8
#define TRASH 9
/* flags end of element table */
#define END_ELEMENTS -1
@@ -146,6 +150,8 @@ static struct expression_element elements[] = {
"ACOS", 7, 8, UNARY_OPERATOR, ACOS, /* arc cosine */
"ASIN", 7, 8, UNARY_OPERATOR, ASIN, /* arc sine */
"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 <= */
"COSH", 7, 8, UNARY_OPERATOR, COSH, /* hyperbolic cosine */
@@ -184,9 +190,9 @@ static struct expression_element elements[] = {
"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, CONDITIONAL, COND_ELSE, /* conditional */
":", 0, 0, ELSE, COND_ELSE, /* else */
"(", 0, 8, UNARY_OPERATOR, PAREN, /* open paren */
"?", 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 */
@@ -194,6 +200,7 @@ static struct expression_element elements[] = {
"*", 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 */
@@ -271,8 +278,6 @@ register char *pinfix;
register char *ppostfix;
short *perror;
{
short got_if;
short got_else;
short no_bytes;
register short operand_needed;
register short new_expression;
@@ -282,8 +287,6 @@ short *perror;
register struct expression_element *pstacktop;
/* place the expression elements into postfix */
got_if = FALSE;
got_else = FALSE;
operand_needed = TRUE;
new_expression = TRUE;
pstacktop = &stack[0];
@@ -347,6 +350,24 @@ short *perror;
new_expression = FALSE;
break;
case SEPERATOR:
if (operand_needed){
*perror = 4;
return(-1);
}
/* add operators to postfix until open paren */
while (pstacktop->element[0] != '('){
if (pstacktop == &stack[1]){
*perror = 6;
return(-1);
}
*ppostfix++ = pstacktop->code;
pstacktop--;
}
operand_needed = TRUE;
break;
case CLOSE_PAREN:
if (operand_needed){
*perror = 4;
@@ -365,28 +386,33 @@ short *perror;
pstacktop--; /* remove ( from stack */
break;
/* conditional includes expression termination */
case CONDITIONAL:
if (got_if){
*perror = 9;
if (operand_needed){
*perror = 4;
return(-1);
}
got_if = TRUE;
/* else includes expression termination */
case ELSE:
if (pelement->type == ELSE){
if (!got_if){
*perror = 11;
return(-1);
}
if (got_else){
*perror = 10;
return(-1);
}
got_else = TRUE;
/* add operators of higher priority to */
/* postfix notation */
while ((pstacktop->in_stack_pri > pelement->in_coming_pri)
&& (pstacktop >= &stack[1])){
*ppostfix++ = pstacktop->code;
pstacktop--;
}
/* add new element to the postfix expression */
*ppostfix++ = pelement->code;
/* add : operator with COND_END code to stack */
if (pelement->element[0] == ':'){
pstacktop++;
*pstacktop = *pelement;
pstacktop->code = COND_END;
}
operand_needed = TRUE;
break;
case EXPR_TERM:
if (operand_needed && !new_expression){
*perror = 4;