From c6304512eb36eb0be3e70ea4849790b248dc1904 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 16 Mar 1998 16:23:42 +0000 Subject: [PATCH] Move private definitions to postfixPvt.h --- src/libCom/calc/calcPerform.c | 1 + src/libCom/calc/postfix.c | 1 + src/libCom/calc/postfixPvt.h | 123 ++++++++++++++++++++++++++++++++++ src/libCom/calcPerform.c | 1 + src/libCom/postfix.c | 1 + src/libCom/postfixPvt.h | 123 ++++++++++++++++++++++++++++++++++ 6 files changed, 250 insertions(+) create mode 100644 src/libCom/calc/postfixPvt.h create mode 100644 src/libCom/postfixPvt.h diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c index d1c7b7ada..a9a84db14 100644 --- a/src/libCom/calc/calcPerform.c +++ b/src/libCom/calc/calcPerform.c @@ -113,6 +113,7 @@ #define epicsExportSharedSymbols #include "postfix.h" +#include "postfixPvt.h" static double local_random(); diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c index 53f9771b4..9f924932c 100644 --- a/src/libCom/calc/postfix.c +++ b/src/libCom/calc/postfix.c @@ -102,6 +102,7 @@ #define epicsExportSharedSymbols #include "postfix.h" +#include "postfixPvt.h" /* declarations for postfix */ diff --git a/src/libCom/calc/postfixPvt.h b/src/libCom/calc/postfixPvt.h new file mode 100644 index 000000000..c014f37c4 --- /dev/null +++ b/src/libCom/calc/postfixPvt.h @@ -0,0 +1,123 @@ +/* postfixPvt.h + * Author: Bob Dalesio + * Date: 9-21-88 + * + * Experimental Physics and Industrial Control System (EPICS) + * + * Copyright 1991, the Regents of the University of California, + * and the University of Chicago Board of Governors. + * + * This software was produced under U.S. Government contracts: + * (W-7405-ENG-36) at the Los Alamos National Laboratory, + * and (W-31-109-ENG-38) at Argonne National Laboratory. + * + * Initial development by: + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory + * + * Co-developed with + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory + * + * Modification Log: + * ----------------- + * .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, CEIL, and FLOOR + * .04 03-03-92 jba added MAX, MIN, and comma + * .05 03-06-92 jba added multiple conditional expressions ? + * .06 04-02-92 jba added CONSTANT for floating pt constants in expression + * .07 05-11-94 jba added CONST_PI, CONST_D2R, and CONST_R2D + */ + +#ifndef INCpostfixPvth +#define INCpostfixPvth + +#include + +/* defines for element table */ +#define BAD_EXPRESSION 0 +#define FETCH_A 1 +#define FETCH_B 2 +#define FETCH_C 3 +#define FETCH_D 4 +#define FETCH_E 5 +#define FETCH_F 6 +#define FETCH_G 7 +#define FETCH_H 8 +#define FETCH_I 9 +#define FETCH_J 10 +#define FETCH_K 11 +#define FETCH_L 12 +#define ACOS 13 +#define ASIN 14 +#define ATAN 15 +#define COS 16 +#define COSH 17 +#define SIN 18 +#define STORE_A 19 +#define STORE_B 20 +#define STORE_C 21 +#define STORE_D 22 +#define STORE_E 23 +#define STORE_F 24 +#define STORE_G 25 +#define STORE_H 26 +#define STORE_I 27 +#define STORE_J 28 +#define STORE_K 29 +#define STORE_L 30 +#define RIGHT_SHIFT 31 +#define LEFT_SHIFT 32 +#define SINH 33 +#define TAN 34 +#define TANH 35 +#define LOG_2 36 +#define COND_ELSE 37 +#define ABS_VAL 38 +#define UNARY_NEG 39 +#define SQU_RT 40 +#define EXP 41 +#define CEIL 42 +#define FLOOR 43 +#define LOG_10 44 +#define LOG_E 45 +#define RANDOM 46 +#define ADD 47 +#define SUB 48 +#define MULT 49 +#define DIV 50 +#define EXPON 51 +#define MODULO 52 +#define BIT_OR 53 +#define BIT_AND 54 +#define BIT_EXCL_OR 55 +#define GR_OR_EQ 56 +#define GR_THAN 57 +#define LESS_OR_EQ 58 +#define LESS_THAN 59 +#define NOT_EQ 60 +#define EQUAL 61 +#define REL_OR 62 +#define REL_AND 63 +#define REL_NOT 64 +#define BIT_NOT 65 +#define PAREN 66 +#define MAX 67 +#define MIN 68 +#define COMMA 69 +#define COND_IF 70 +#define COND_END 71 +#define CONSTANT 72 +#define CONST_PI 73 +#define CONST_D2R 74 +#define CONST_R2D 75 +#define NINT 76 +#define ATAN2 77 +#define END_STACK 127 + +#endif /* INCpostfixPvth */ diff --git a/src/libCom/calcPerform.c b/src/libCom/calcPerform.c index d1c7b7ada..a9a84db14 100644 --- a/src/libCom/calcPerform.c +++ b/src/libCom/calcPerform.c @@ -113,6 +113,7 @@ #define epicsExportSharedSymbols #include "postfix.h" +#include "postfixPvt.h" static double local_random(); diff --git a/src/libCom/postfix.c b/src/libCom/postfix.c index 53f9771b4..9f924932c 100644 --- a/src/libCom/postfix.c +++ b/src/libCom/postfix.c @@ -102,6 +102,7 @@ #define epicsExportSharedSymbols #include "postfix.h" +#include "postfixPvt.h" /* declarations for postfix */ diff --git a/src/libCom/postfixPvt.h b/src/libCom/postfixPvt.h new file mode 100644 index 000000000..c014f37c4 --- /dev/null +++ b/src/libCom/postfixPvt.h @@ -0,0 +1,123 @@ +/* postfixPvt.h + * Author: Bob Dalesio + * Date: 9-21-88 + * + * Experimental Physics and Industrial Control System (EPICS) + * + * Copyright 1991, the Regents of the University of California, + * and the University of Chicago Board of Governors. + * + * This software was produced under U.S. Government contracts: + * (W-7405-ENG-36) at the Los Alamos National Laboratory, + * and (W-31-109-ENG-38) at Argonne National Laboratory. + * + * Initial development by: + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory + * + * Co-developed with + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory + * + * Modification Log: + * ----------------- + * .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, CEIL, and FLOOR + * .04 03-03-92 jba added MAX, MIN, and comma + * .05 03-06-92 jba added multiple conditional expressions ? + * .06 04-02-92 jba added CONSTANT for floating pt constants in expression + * .07 05-11-94 jba added CONST_PI, CONST_D2R, and CONST_R2D + */ + +#ifndef INCpostfixPvth +#define INCpostfixPvth + +#include + +/* defines for element table */ +#define BAD_EXPRESSION 0 +#define FETCH_A 1 +#define FETCH_B 2 +#define FETCH_C 3 +#define FETCH_D 4 +#define FETCH_E 5 +#define FETCH_F 6 +#define FETCH_G 7 +#define FETCH_H 8 +#define FETCH_I 9 +#define FETCH_J 10 +#define FETCH_K 11 +#define FETCH_L 12 +#define ACOS 13 +#define ASIN 14 +#define ATAN 15 +#define COS 16 +#define COSH 17 +#define SIN 18 +#define STORE_A 19 +#define STORE_B 20 +#define STORE_C 21 +#define STORE_D 22 +#define STORE_E 23 +#define STORE_F 24 +#define STORE_G 25 +#define STORE_H 26 +#define STORE_I 27 +#define STORE_J 28 +#define STORE_K 29 +#define STORE_L 30 +#define RIGHT_SHIFT 31 +#define LEFT_SHIFT 32 +#define SINH 33 +#define TAN 34 +#define TANH 35 +#define LOG_2 36 +#define COND_ELSE 37 +#define ABS_VAL 38 +#define UNARY_NEG 39 +#define SQU_RT 40 +#define EXP 41 +#define CEIL 42 +#define FLOOR 43 +#define LOG_10 44 +#define LOG_E 45 +#define RANDOM 46 +#define ADD 47 +#define SUB 48 +#define MULT 49 +#define DIV 50 +#define EXPON 51 +#define MODULO 52 +#define BIT_OR 53 +#define BIT_AND 54 +#define BIT_EXCL_OR 55 +#define GR_OR_EQ 56 +#define GR_THAN 57 +#define LESS_OR_EQ 58 +#define LESS_THAN 59 +#define NOT_EQ 60 +#define EQUAL 61 +#define REL_OR 62 +#define REL_AND 63 +#define REL_NOT 64 +#define BIT_NOT 65 +#define PAREN 66 +#define MAX 67 +#define MIN 68 +#define COMMA 69 +#define COND_IF 70 +#define COND_END 71 +#define CONSTANT 72 +#define CONST_PI 73 +#define CONST_D2R 74 +#define CONST_R2D 75 +#define NINT 76 +#define ATAN2 77 +#define END_STACK 127 + +#endif /* INCpostfixPvth */