--- capa/capa51/pProj/capaParser.h	1999/10/13 20:05:00	1.2
+++ capa/capa51/pProj/capaParser.h	2000/06/30 16:13:00	1.6
@@ -81,6 +81,7 @@ typedef struct _symbol {
   struct _argNode   *s_argp;
   struct _treeNode  *s_treep;
   struct _symbol    *s_nextp;
+  struct _symbol    *s_prevp;
   struct _symbol    *s_arrayp;
   struct _pts_list  *s_ptslist;
   int                s_access_cnt;
@@ -109,9 +110,11 @@ typedef struct _argNode {
     struct _argNode *a_prev;
  } ArgNode_t;
  
-#define   FIRST_SYMBOLP(aaa)     (aaa->a_sp)
+#define   FIRST_SYMBOLP(aaa)      (aaa->a_sp)
 #define   SECOND_SYMBOLP(aaa)   ( (aaa->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   FIFTH_SYMBOLP(aaa)    ( ((((aaa->a_next)->a_next)->a_next)->a_next)->a_sp )
 #define   FIRST_ARGNAME(aaa)    ( FIRST_SYMBOLP(aaa)->s_name )
 #define   FIRST_ARGTYPE(aaa)    ( FIRST_SYMBOLP(aaa)->s_type )
 #define   FIRST_ARGINT(aaa)     ( FIRST_SYMBOLP(aaa)->s_int )
@@ -122,10 +125,21 @@ typedef struct _argNode {
 #define   SECOND_ARGINT(aaa)    ( SECOND_SYMBOLP(aaa)->s_int)
 #define   SECOND_ARGREAL(aaa)   ( SECOND_SYMBOLP(aaa)->s_real)
 #define   SECOND_ARGSTR(aaa)    ( SECOND_SYMBOLP(aaa)->s_str)
+#define   THIRD_ARGNAME(aaa)    ( THIRD_SYMBOLP(aaa)->s_name )
 #define   THIRD_ARGTYPE(aaa)    ( THIRD_SYMBOLP(aaa)->s_type)
 #define   THIRD_ARGINT(aaa)     ( THIRD_SYMBOLP(aaa)->s_int)
 #define   THIRD_ARGREAL(aaa)    ( THIRD_SYMBOLP(aaa)->s_real)
 #define   THIRD_ARGSTR(aaa)     ( THIRD_SYMBOLP(aaa)->s_str)
+#define   FOURTH_ARGTYPE(aaa)   ( FOURTH_SYMBOLP(aaa)->s_type)
+#define   FOURTH_ARGNAME(aaa)   ( FOURTH_SYMBOLP(aaa)->s_name )
+#define   FOURTH_ARGINT(aaa)    ( FOURTH_SYMBOLP(aaa)->s_int)
+#define   FOURTH_ARGREAL(aaa)   ( FOURTH_SYMBOLP(aaa)->s_real)
+#define   FOURTH_ARGSTR(aaa)    ( FOURTH_SYMBOLP(aaa)->s_str)
+#define   FIFTH_ARGTYPE(aaa)    ( FIFTH_SYMBOLP(aaa)->s_type)
+#define   FIFTH_ARGNAME(aaa)    ( FIFTH_SYMBOLP(aaa)->s_name )
+#define   FIFTH_ARGINT(aaa)     ( FIFTH_SYMBOLP(aaa)->s_int)
+#define   FIFTH_ARGREAL(aaa)    ( FIFTH_SYMBOLP(aaa)->s_real)
+#define   FIFTH_ARGSTR(aaa)     ( FIFTH_SYMBOLP(aaa)->s_str)
 
 
 
@@ -253,6 +267,7 @@ typedef struct _problem {
    int                 show_explain;
    int                 show_br;      /* web only, <BR> on is by default */
    int                 show_ans_box; /* web only, answer box is shown by default */
+   int                 verbatim; /* do verbatim protection around answers */
    int                 ans_op;   /* ANS_AND or ANS_OR */
    char               *id_list;
    struct   _pts_list *pts_list;
@@ -340,7 +355,11 @@ typedef struct _answer_info {
 #define    DO_SHOW              1
 #define    DONOT_SHOW           0
 
+#define    DO_VERBATIM          1
+#define    DONOT_VERBATIM       0
+
 #define    SHOW_BR_DEFAULT      DO_SHOW
+#define    VERBATIM_DEFAULT     DO_VERBATIM
 #define    SHOW_ANSBOX_DEFAULT  DO_SHOW
 
 #define    SIG_LB_DEFAULT       0        /* ---- sig_lbound ------- */
@@ -379,6 +398,7 @@ typedef struct _answer_info {
 #define    ANS_CNT_NOT_MATCH   9
 #define    SUB_RECORDED        10
 #define    BAD_FORMULA         11
+#define    WANTED_NUMERIC      12
 
 
 
@@ -407,11 +427,28 @@ typedef struct _answer_info {
 
 /* ================================================================ */
 /********************** for random(), /MAP(), capa_PIN() */
+/* BETA_DIS is used for genbet() */
+/* CHI_DIS  is for genchi() */
+/* EXPONENTIAL_DIS    genexp() */
+/* GAMMA_DIS    gengam() */
+/* MULTI_NORM_DIS    genmn() */
+/* NONCEN_CHI_DIS    gennch() */
+/* NORMAL_DIS        gennor() */
+/* POISSON_DIS       long ignpoi(float mu) */
 
 #define    RANDOM_G          1L
 #define    PERMUTATION_G     2L
 #define    PIN_G             3L
 
+#define    NORMAL_DIS          10 
+#define    POISSON_DIS         11
+#define    EXPONENTIAL_DIS     12 
+#define    BETA_DIS            13
+#define    GAMMA_DIS           14
+#define    CHI_DIS             15
+#define    NONCENTRAL_CHI_DIS  16
+#define    FORMULA_PICK_POINTS 17
+
 #define    GET_GENERATOR     0L
 #define    SET_GENERATOR     1L
 
@@ -510,10 +547,11 @@ TreeNode_t *t_splay             CAPA_ARG
 void        print_array_element CAPA_ARG((Symbol *array_p));
 Symbol     *find_arrayid        CAPA_ARG((char *name_p));
 Symbol     *find_array_by_index CAPA_ARG((Symbol *array_p,char *idx_p));
+int         free_array          CAPA_ARG((char *name_p));
 Symbol     *array_min_max       CAPA_ARG((char *name_p,int min));
 Symbol     *array_moments       CAPA_ARG((char *result_p,char *name_p));
 
-
+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));
 void        free_formula_tree   CAPA_ARG(());