--- capa/capa51/pProj/capaParser.h	2000/08/22 16:00:25	1.10
+++ capa/capa51/pProj/capaParser.h	2006/07/28 06:38:13	1.14
@@ -79,7 +79,7 @@
 #define  MAX_FUNC_NEST     1024    /* sin(cos(tan(...)))   */
 /*#define  MAX_QTEXT_LEN     4096     overall question text in a set *NO LONGER NEEDED */
 #define  WARN_MSG_LENGTH   1024    /* for warning messages */
-
+#define  MAX_ASCII          256
 
 #define  ASCII_MODE           1
 #define  TeX_MODE             2
@@ -428,8 +428,11 @@ typedef struct _answer_info {
 #define    SUB_RECORDED        10
 #define    BAD_FORMULA         11
 #define    WANTED_NUMERIC      12
-
-
+#define    UNIT_INVALID_INSTRUCTOR  13
+#define    UNIT_INVALID_STUDENT1    141
+#define    UNIT_INVALID_STUDENT2    142
+#define    UNIT_INVALID_STUDENT3    143
+#define    UNIT_IRRECONCIBLE        15
 
 /* =============================================================== */
 
@@ -550,6 +553,7 @@ void        start_question_over CAPA_ARG
 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)); 
 /*---------------------------------------------------- capaParserUtils.c */ 
+Symbol*     negate              CAPA_ARG((Symbol* symb));
 void        problem_default     CAPA_ARG((Problem_t  *p));
 int         comp_name           CAPA_ARG((char *a,char *b));
 int         comp_namesymbol     CAPA_ARG((char *a, Symbol *b));
@@ -624,7 +628,7 @@ int         inorder_utree       CAPA_ARG
 int         postorder_utree     CAPA_ARG((Unit_t *node_p));
 int         postwalk_utree      CAPA_ARG((Unit_t *n_p));
 void        process_op          CAPA_ARG((int op));
-void        process_utree       CAPA_ARG((Unit_t *t));
+Unit_t*     process_utree       CAPA_ARG((Unit_t *t));
 int         check_correct_unit  CAPA_ARG((char *u_symb,Unit_t *t,double *scale));
 int         free_utree          CAPA_ARG((Unit_t *t));
 int         u_postfree          CAPA_ARG((Unit_t *t));