Diff for /capa/capa51/pProj/capaParser.h between versions 1.9 and 1.11

version 1.9, 2000/08/07 20:47:29 version 1.11, 2000/11/06 20:17:42
Line 139  typedef struct _argNode { Line 139  typedef struct _argNode {
 #define   THIRD_SYMBOLP(aaa)    ( ((aaa->a_next)->a_next)->a_sp )  #define   THIRD_SYMBOLP(aaa)    ( ((aaa->a_next)->a_next)->a_sp )
 #define   FOURTH_SYMBOLP(aaa)   ( (((aaa->a_next)->a_next)->a_next)->a_sp )  #define   FOURTH_SYMBOLP(aaa)   ( (((aaa->a_next)->a_next)->a_next)->a_sp )
 #define   FIFTH_SYMBOLP(aaa)    ( ((((aaa->a_next)->a_next)->a_next)->a_next)->a_sp )  #define   FIFTH_SYMBOLP(aaa)    ( ((((aaa->a_next)->a_next)->a_next)->a_next)->a_sp )
   #define   SIXTH_SYMBOLP(aaa)    ( (((((aaa->a_next)->a_next)->a_next)->a_next)->a_next)->a_sp )
 #define   FIRST_ARGNAME(aaa)    ( FIRST_SYMBOLP(aaa)->s_name )  #define   FIRST_ARGNAME(aaa)    ( FIRST_SYMBOLP(aaa)->s_name )
 #define   FIRST_ARGTYPE(aaa)    ( FIRST_SYMBOLP(aaa)->s_type )  #define   FIRST_ARGTYPE(aaa)    ( FIRST_SYMBOLP(aaa)->s_type )
 #define   FIRST_ARGINT(aaa)     ( FIRST_SYMBOLP(aaa)->s_int )  #define   FIRST_ARGINT(aaa)     ( FIRST_SYMBOLP(aaa)->s_int )
Line 164  typedef struct _argNode { Line 165  typedef struct _argNode {
 #define   FIFTH_ARGINT(aaa)     ( FIFTH_SYMBOLP(aaa)->s_int)  #define   FIFTH_ARGINT(aaa)     ( FIFTH_SYMBOLP(aaa)->s_int)
 #define   FIFTH_ARGREAL(aaa)    ( FIFTH_SYMBOLP(aaa)->s_real)  #define   FIFTH_ARGREAL(aaa)    ( FIFTH_SYMBOLP(aaa)->s_real)
 #define   FIFTH_ARGSTR(aaa)     ( FIFTH_SYMBOLP(aaa)->s_str)  #define   FIFTH_ARGSTR(aaa)     ( FIFTH_SYMBOLP(aaa)->s_str)
   #define   SIXTH_ARGTYPE(aaa)    ( SIXTH_SYMBOLP(aaa)->s_type)
   #define   SIXTH_ARGNAME(aaa)    ( SIXTH_SYMBOLP(aaa)->s_name )
   #define   SIXTH_ARGINT(aaa)     ( SIXTH_SYMBOLP(aaa)->s_int)
   #define   SIXTH_ARGREAL(aaa)    ( SIXTH_SYMBOLP(aaa)->s_real)
   #define   SIXTH_ARGSTR(aaa)     ( SIXTH_SYMBOLP(aaa)->s_str)
   
   
   
Line 460  typedef struct _answer_info { Line 465  typedef struct _answer_info {
 /* NORMAL_DIS        gennor() */  /* NORMAL_DIS        gennor() */
 /* POISSON_DIS       long ignpoi(float mu) */  /* POISSON_DIS       long ignpoi(float mu) */
   
 #define    RANDOM_G          1L  #define    RANDOM_G            1L
 #define    PERMUTATION_G     2L  #define    PERMUTATION_G       2L
 #define    PIN_G             3L  #define    PIN_G               3L
   
 #define    NORMAL_DIS          10   #define    NORMAL_DIS          10 
 #define    POISSON_DIS         11  #define    POISSON_DIS         11
Line 472  typedef struct _answer_info { Line 477  typedef struct _answer_info {
 #define    CHI_DIS             15  #define    CHI_DIS             15
 #define    NONCENTRAL_CHI_DIS  16  #define    NONCENTRAL_CHI_DIS  16
 #define    FORMULA_PICK_POINTS 17  #define    FORMULA_PICK_POINTS 17
   #define    MULTIVARIATE_NORMAL_DIS  18
   
 #define    GET_GENERATOR     0L  #define    GET_GENERATOR        0L
 #define    SET_GENERATOR     1L  #define    SET_GENERATOR        1L
   
 #define    FORWARD_MAP        0  #define    FORWARD_MAP           0
 #define    REVERSE_MAP        1  #define    REVERSE_MAP           1
   
   
   
Line 544  void        start_question_over CAPA_ARG Line 550  void        start_question_over CAPA_ARG
 Symbol*     get_array_symbol    CAPA_ARG((Symbol* name,Symbol* index,int free_symbols));  Symbol*     get_array_symbol    CAPA_ARG((Symbol* name,Symbol* index,int free_symbols));
 Symbol*     build_array_list    CAPA_ARG((Symbol* ar_name,int num_elem));   Symbol*     build_array_list    CAPA_ARG((Symbol* ar_name,int num_elem)); 
 /*---------------------------------------------------- capaParserUtils.c */   /*---------------------------------------------------- capaParserUtils.c */ 
   Symbol*     negate              CAPA_ARG((Symbol* symb));
 void        problem_default     CAPA_ARG((Problem_t  *p));  void        problem_default     CAPA_ARG((Problem_t  *p));
 int         comp_name           CAPA_ARG((char *a,char *b));  int         comp_name           CAPA_ARG((char *a,char *b));
 int         comp_namesymbol     CAPA_ARG((char *a, Symbol *b));  int         comp_namesymbol     CAPA_ARG((char *a, Symbol *b));
Line 574  Symbol     *find_array_by_index CAPA_ARG Line 581  Symbol     *find_array_by_index CAPA_ARG
 int         free_array          CAPA_ARG((char *name_p));  int         free_array          CAPA_ARG((char *name_p));
 Symbol     *array_min_max       CAPA_ARG((char *name_p,int min));  Symbol     *array_min_max       CAPA_ARG((char *name_p,int min));
 Symbol     *array_moments       CAPA_ARG((char *result_p,char *name_p));  Symbol     *array_moments       CAPA_ARG((char *result_p,char *name_p));
   Symbol     *gen_multivariate_normal  CAPA_ARG((char *output_p,char *seed,int
   item_cnt,int dimen,char *m_vec_str,char *c_vec_str));
 Symbol     *gen_random_by_selector  CAPA_ARG((char *output_p,int sel,char *seed,int item_cnt,float p1,float p2));  Symbol     *gen_random_by_selector  CAPA_ARG((char *output_p,int sel,char *seed,int item_cnt,float p1,float p2));
 int         setup_formula_id    CAPA_ARG((char *v_str, char *pt_str));  int         setup_formula_id    CAPA_ARG((char *v_str, char *pt_str));
 void        free_formula_tree   CAPA_ARG(());  void        free_formula_tree   CAPA_ARG(());

Removed from v.1.9  
changed lines
  Added in v.1.11


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>