--- capa/capa51/pProj/capaGrammarDef.y	1999/12/07 19:10:47	1.7
+++ capa/capa51/pProj/capaGrammarDef.y	2000/03/22 21:08:03	1.10
@@ -36,17 +36,18 @@
                                      case S_VAR:  case S_CONSTANT: \
                                               printf("STR(%s)\n",(xx)->s_str); break; \
                                } }
-#else
+#else  /* YACC_DBUG */
 #define  YYDBUG_PR1(xx)        { }
 #define  YYDBUG_PR2(xx,yy)     { }
 #define  YYDBUG_PR3(xx,yy,zz)  { }
 #define  YYDBUG_PR4(xx,yy,zz,aa)  { }
 #define  YYDBUG_SYM(xx)        { }
-#endif
+#endif /* YACC_DBUG */
 
 int   yylex();
 void  yyerror(char*);
 void  free_calc_expr(Symbol*);
+void assign_pts (Symbol *, Symbol *, Symbol *);
 /******************************************************************************/
 /* GLOBAL VARIABLES                                                           */
 /******************************************************************************/
@@ -117,7 +118,7 @@ PointsList_t      *LastPtsList;
 %token       ANS_OFF         ANS_ON          ANS_OR          ANS_ORDERED
 %token       ANS_PATH        ANS_PCREDIT     ANS_PLUS        ANS_RANGE       
 %token       ANS_SHOW_BR     ANS_SIG         ANS_TOLERANCE   ANS_TRY         ANS_TYPE
-%token       ANS_UNFMT       ANS_UNIT        ANS_WEIGHT 
+%token       ANS_UNFMT       ANS_UNIT        ANS_VERBATIM    ANS_WEIGHT 
 %token       VAR_RANGE       VERBATIM
 %token       SLASH           FORMAT
 %token       EQ_op  NE_op  GT_op  GE_op  LT_op  LE_op  AND_op  OR_op   EoL    
@@ -287,36 +288,36 @@ statement    :  IDENTIFIER '=' calc_expr
              ;
 
 rqo_def      :  rqo_speca             { rqo_1spec(); }
-             |  rqo_speca "," rqo_def { rqo_2spec(); }
+             |  rqo_speca ',' rqo_def { rqo_2spec(); }
              ;
 
 rqo_speca    : an_integer                 {start_rqo_type(SINGLE);append_rqo($1);}
-             | an_integer "!"             {start_rqo_type(IMMOBILE);append_rqo($1);}
-             | an_integer "-" an_integer  {start_rqo_type(RANGE);append_rqo($1);
+             | an_integer '!'             {start_rqo_type(IMMOBILE);append_rqo($1);}
+             | an_integer '-' an_integer  {start_rqo_type(RANGE);append_rqo($1);
                                            append_rqo($3);
                                           }
-             | an_integer "~" rqo_specb   {prefix_rqo($1);}
-             | an_integer "+" rqo_specc   {prefix_rqo($1);}
+             | an_integer '~' rqo_specb   {prefix_rqo($1);}
+             | an_integer '+' rqo_specc   {prefix_rqo($1);}
              ;
 
 rqo_specb    : an_integer                 {start_rqo_type(ALL_MIX);append_rqo($1);}
-             | an_integer "~" rqo_specb   {prefix_rqo($1);}
-             | an_integer "+" an_integer  {start_rqo_type(LAST_FIXED);append_rqo($1);
+             | an_integer '~' rqo_specb   {prefix_rqo($1);}
+             | an_integer '+' an_integer  {start_rqo_type(LAST_FIXED);append_rqo($1);
                                            append_rqo($3);}
              ;
 
 rqo_specc    : an_integer                 {start_rqo_type(ALL_FIXED);append_rqo($1);}
-             | an_integer "+" rqo_specd   {prefix_rqo($1);}
-             | an_integer "~" rqo_spece   {prefix_rqo($1);}
+             | an_integer '+' rqo_specd   {prefix_rqo($1);}
+             | an_integer '~' rqo_spece   {prefix_rqo($1);}
              ;
 
 rqo_specd    : an_integer                 {start_rqo_type(ALL_FIXED);append_rqo($1);}
-             | an_integer "+" rqo_specd   {prefix_rqo($1);}
+             | an_integer '+' rqo_specd   {prefix_rqo($1);}
              ;
 
 rqo_spece    : an_integer                 {start_rqo_type(FIRST_FIXED);append_rqo($1);}
-             | an_integer "~" rqo_spece   {prefix_rqo($1);}
-             | an_integer "+" an_integer  {start_rqo_type(BOTH_FIXED);append_rqo($1);
+             | an_integer '~' rqo_spece   {prefix_rqo($1);}
+             | an_integer '+' an_integer  {start_rqo_type(BOTH_FIXED);append_rqo($1);
                                            append_rqo($3);}
              ;
 
@@ -505,6 +506,10 @@ ans_infospec : ANS_TOLERANCE '=' a_numbe
 	                               }
 	     | ANS_SHOW_BR '=' ANS_OFF {  LexiProblem_p->show_br = DONOT_SHOW;
 	                               }
+	     | ANS_VERBATIM '=' ANS_ON  {  LexiProblem_p->verbatim = DO_VERBATIM;
+	                                }
+	     | ANS_VERBATIM '=' ANS_OFF {  LexiProblem_p->verbatim = DONOT_VERBATIM;
+	                                }
 	     | ANS_BOX_SHOW '=' ANS_ON {  LexiProblem_p->show_ans_box  = DO_SHOW;
 	                               }
 	     | ANS_BOX_SHOW '=' ANS_OFF {  LexiProblem_p->show_ans_box = DONOT_SHOW;
@@ -844,7 +849,10 @@ an_integer   : I_CONSTANT
 a_real       : R_CONSTANT               { $$ = $1; } 
              ;
 
-an_array     : ARRAY_ID '[' calc_expr ']'     {   $$=get_array_symbol($1,$3,1);   } 
+an_array     : ARRAY_ID '[' calc_expr ']'     {   
+                                         YYDBUG_PR1(" an_array <= ARRAY_ID '['calc_expr ']' ");
+                                         $$=get_array_symbol($1,$3,1);   
+                                               } 
              ;
 
 startQ       :                  { /* first matching will occur before first line of input text */
@@ -927,7 +935,7 @@ Symbol *name,*index;int free_symbols;
   sprintf(key,"%s[%s]",name->s_name,tmp);
   
   a_p = find_arrayid(name->s_name);   /* use the array name to search array tree */
-                                      /* */
+                                      /* did not check for error! */
   s_p = find_array_by_index(a_p,key); /* use the index portion to search along array linked list */
   capa_mfree((char *)tmp); capa_mfree((char *)key);
   
@@ -1798,7 +1806,9 @@ assign_id_list( s ) Symbol *s;
   }
 }
 
-void assign_pts ( Symbol* coord1, Symbol* coord2, Symbol* num) {
+/* void assign_pts ( Symbol* coord1, Symbol* coord2, Symbol* num) { */
+void assign_pts (coord1, coord2, num)Symbol *coord1;Symbol *coord2;Symbol *num;
+{
   PointsList_t *pt;
   if( LastPtsList != NULL ) {
     LastPtsList->pts_next = gen_ptslist( coord1, coord2, num );