--- capa/capa51/pProj/capaGrammarDef.y 1999/09/28 21:26:21 1.1.1.1 +++ capa/capa51/pProj/capaGrammarDef.y 1999/12/07 19:10:47 1.7 @@ -194,7 +194,7 @@ a_line : startL statement EoL | EoL { YYDBUG_PR1(" a_line <= (CR)\n"); } | VERBATIM { YYDBUG_PR1(" a_line <= (VERBATIM)\n"); switch(Parsemode_f) { - case TeX_MODE: append_text("\begin{verbatim}"); + case TeX_MODE: append_text("\\begin{verbatim}"); break; case HTML_MODE: append_text("
");
 					    break;
@@ -202,9 +202,9 @@ a_line       :  startL  statement EoL
                                           append_text($1->s_str);
                                           capa_mfree($1->s_str); capa_mfree((char *)$1);
 	                                  switch(Parsemode_f) {
-					  case TeX_MODE: append_text("\end{verbatim}");
+					  case TeX_MODE: append_text("\\end{verbatim}\n");
 					    break;
-					  case HTML_MODE: append_text("
"); + case HTML_MODE: append_text("\n"); break; } } @@ -332,7 +332,7 @@ q_text : TEXT_LINE ; if_expr : CAPA_IF '(' calc_expr ')' - { int leng; /* begin_next_line(); no use, can be get rid of */ + { int leng=0; /* begin_next_line(); no use, can be get rid of */ YYDBUG_PR2("(IF expr )\n",IFcount); switch($3->s_type) { case IDENTIFIER: @@ -358,8 +358,10 @@ if_expr : CAPA_IF '(' calc_expr ' } break; case S_CONSTANT: - leng = strlen($3->s_str); - capa_mfree($3->s_str); + if ( $3->s_str) { + leng = strlen($3->s_str); + capa_mfree($3->s_str); + } if(leng == 0) { IFstatus[IFcount] = IF_FALSE; begin_if_skip(); @@ -369,8 +371,11 @@ if_expr : CAPA_IF '(' calc_expr ' } break; case S_VAR: - leng = strlen($3->s_str); - if(leng == 0) { + if ( $3->s_str) { + leng = strlen($3->s_str); + capa_mfree($3->s_str); + } + if(leng == 0) { IFstatus[IFcount] = IF_FALSE; begin_if_skip(); }else{ @@ -549,54 +554,64 @@ pt_list : pt_list ',' point_coo | pt_range { } ; -pt_range : point_coord ':' point_coord '#' IDENTIFIER { PointsList_t *pt; - - if( LastPtsList != NULL ) { - LastPtsList->pts_next = gen_ptslist( $1, $3, $5 ); - pt = LastPtsList->pts_next; - while( pt->pts_next != NULL ) { - pt = pt->pts_next; - } - LastPtsList = pt; - } else { - CurrPtsList = gen_ptslist( $1, $3, $5 ); - LastPtsList = CurrPtsList; - } - if( $1->s_type == S_CONSTANT ) { - capa_mfree($1->s_str); capa_mfree((char *)$1); - } - if( $3->s_type == S_CONSTANT ) { - capa_mfree($3->s_str); capa_mfree((char *)$3); - } - } - | point_coord ':' point_coord '#' a_number { PointsList_t *pt; - - if( LastPtsList != NULL ) { - LastPtsList->pts_next = gen_ptslist( $1, $3, $5 ); - pt = LastPtsList->pts_next; - while( pt->pts_next != NULL ) { - pt = pt->pts_next; - } - LastPtsList = pt; - } else { - CurrPtsList = gen_ptslist( $1, $3, $5 ); - LastPtsList = CurrPtsList; - } - if( $1->s_type == S_CONSTANT ) { - capa_mfree($1->s_str); capa_mfree((char *)$1); - } - if( $3->s_type == S_CONSTANT ) { - capa_mfree($3->s_str); capa_mfree((char *)$3); - } - if( $5->s_type == I_CONSTANT || $5->s_type == R_CONSTANT) { - capa_mfree((char *)$5); - } - } +pt_range : point_coord ':' point_coord '#' IDENTIFIER + { + assign_pts($1,$3,$5); + /*PointsList_t *pt; + if( LastPtsList != NULL ) { + LastPtsList->pts_next = gen_ptslist( $1, $3, $5 ); + pt = LastPtsList->pts_next; + while( pt->pts_next != NULL ) { + pt = pt->pts_next; + } + LastPtsList = pt; + } else { + CurrPtsList = gen_ptslist( $1, $3, $5 ); + LastPtsList = CurrPtsList; + } + if( $1->s_type == S_CONSTANT ) { + capa_mfree($1->s_str); capa_mfree((char *)$1); + } + if( $3->s_type == S_CONSTANT ) { + capa_mfree($3->s_str); capa_mfree((char *)$3); + } + */ + } + | point_coord ':' point_coord '#' ARRAY_ID '[' calc_expr ']' + { assign_pts($1,$3,get_array_symbol($5,$7,1)); } + | point_coord ':' point_coord '#' a_number + { + assign_pts($1,$3,$5); + /*PointsList_t *pt; + + if( LastPtsList != NULL ) { + LastPtsList->pts_next = gen_ptslist( $1, $3, $5 ); + pt = LastPtsList->pts_next; + while( pt->pts_next != NULL ) { + pt = pt->pts_next; + } + LastPtsList = pt; + } else { + CurrPtsList = gen_ptslist( $1, $3, $5 ); + LastPtsList = CurrPtsList; + } + if( $1->s_type == S_CONSTANT ) { + capa_mfree($1->s_str); capa_mfree((char *)$1); + } + if( $3->s_type == S_CONSTANT ) { + capa_mfree($3->s_str); capa_mfree((char *)$3); + } + if( $5->s_type == I_CONSTANT || $5->s_type == R_CONSTANT) { + capa_mfree((char *)$5); + } + */ + } ; -point_coord : IDENTIFIER { $$ = $1; } - | S_CONSTANT { $$ = $1; } +point_coord : IDENTIFIER { $$ = $1; } + | ARRAY_ID '[' calc_expr ']' { $$ = get_array_symbol($1,$3,1); } + | S_CONSTANT { $$ = $1; } ; @@ -646,7 +661,7 @@ answer_comp : ANS_CS { map_expr : startM '(' basic_constr ';' var_list ';' arg_list ')' - { char key[SIXTEEN]; + { char key[SMALL_LINE_BUFFER]; char warn_msg[WARN_MSG_LENGTH]; int result=0; @@ -674,7 +689,7 @@ map_expr : startM '(' basic_constr ' free_arglist($7->s_argp); } | startR '(' basic_constr ';' var_list ';' arg_list ')' - { char key[SIXTEEN]; + { char key[SMALL_LINE_BUFFER]; char warn_msg[WARN_MSG_LENGTH]; int result=0; @@ -889,7 +904,6 @@ Symbol *name,*index;int free_symbols; Symbol *s_p, *a_p; char *key, *tmp; int leng, idx_len; - leng = strlen(name->s_name)+8; /* [ ] */ switch(index->s_type) { @@ -933,17 +947,17 @@ Symbol *ar_name;int num_elem; { int i; Symbol *arg_list,*a_p; - char idx_str[SIXTEEN]; + char idx_str[MAX_BUFFER_SIZE]; - a_p = find_arrayid(ar_name); + a_p = find_arrayid(ar_name->s_name); i = 1; - sprintf(idx_str,"%ld",i); /* create array elements with integer index */ + sprintf(idx_str,"%s[%d]",ar_name->s_name,i); /* create array elements with integer index */ arg_list = find_array_by_index(a_p,idx_str); /* will create a new element if not found */ arg_list->s_argc=1; arg_list->s_argp=new_arglist(arg_list); for (i=2;i<=num_elem;i++) { - sprintf(idx_str,"%ld",i); + sprintf(idx_str,"%s[%d]",ar_name->s_name,i); arg_list->s_argc++; arg_list->s_argp=addto_arglist(arg_list->s_argp,find_array_by_index(a_p,idx_str)); } @@ -1074,7 +1088,7 @@ append_warn(type,str) int type;char *str /*********** if *b is a constant symbol, destroy (free) b ********************/ /*********** if *a is a var symbol, create a new symbol **********************/ /* do not free(*a) */ -/* */ +/* If either a or b is invalid it propagates the error up the parse tree */ Symbol * symbols_op(a, b, op) Symbol *a; Symbol *b; int op; { @@ -1089,12 +1103,11 @@ if( a->s_type == IDENTIFIER || b->s_type if(a->s_type == IDENTIFIER) { /* a is IDENTIFIER */ sprintf(warn_msg,"var \"%s\" not defined before use.\n", a->s_name); capa_msg(MESSAGE_ERROR,warn_msg); - return (b); + return (a); } else { /* b is IDENTIFIER */ - sprintf(warn_msg, - "var \"%s\" not defined before use.\n",b->s_name); + sprintf(warn_msg,"var \"%s\" not defined before use.\n",b->s_name); capa_msg(MESSAGE_ERROR,warn_msg); - return (a); + return (b); } } else { /* a and b are neither identifiers */ if( (a->s_type == I_VAR) || @@ -1139,70 +1152,84 @@ if( a->s_type == IDENTIFIER || b->s_type (b->s_type == S_VAR) || (b->s_type == S_CONSTANT) ) { /* either a or b is a string */ type = S_CONSTANT; /* the return type is a string */ if( (a->s_type == S_VAR) || (a->s_type == S_CONSTANT) ) { /* a is a string */ - switch( b->s_type ) { - case I_VAR: - case I_CONSTANT: - leng = SIXTEEN; /* assuming a long integer does not exceed 16 digits*/ - b_str= capa_malloc(sizeof(char), leng); - sprintf(b_str,"%ld", b->s_int); - break; - case R_VAR: - case R_CONSTANT: - leng = SMALL_LINE_BUFFER;/*assuming a double does not exceed128chars*/ - b_str= capa_malloc(sizeof(char), leng); - sprintf(b_str,"%.15g", b->s_real); - break; - case S_VAR: - case S_CONSTANT: /* DONE: get rid of limitations on b_str[] */ - leng = strlen( b->s_str ) + 1; - b_str= capa_malloc(sizeof(char), leng); - sprintf(b_str,"%s",b->s_str); - /*if(b->s_type == S_CONSTANT) capa_mfree(b->s_str);*/ - break; - } - switch( op ) { - case ADD_op: - leng = strlen( a->s_str ) + strlen(b_str) + 1; - r_strp = capa_malloc(sizeof(char), leng); /* **** */ - strcat(r_strp, a->s_str); - strcat(r_strp, b_str); /* concatenate two strings together */ - if( !new ) capa_mfree(a->s_str); - a_symp->s_str = r_strp; - break; - case SUB_op: - case MUL_op: - case DIV_op: - case IDIV_op: - if( !new ) capa_mfree(a->s_str); - a_symp->s_str = strsave("<>"); - sprintf(warn_msg,"integer division (%%) cannot accept string operand!\n"); - capa_msg(MESSAGE_ERROR,warn_msg); - break; - case EQ_op: a_symp->s_int = (strcmp(a->s_str, b_str) == 0? 1: 0); - type = I_CONSTANT; break; - case NE_op: a_symp->s_int = (strcmp(a->s_str, b_str) == 0? 0: 1); - type = I_CONSTANT; break; - case GT_op: a_symp->s_int = (strcmp(a->s_str, b_str) > 0? 1: 0); - type = I_CONSTANT; break; - case GE_op: a_symp->s_int = (strcmp(a->s_str, b_str) >= 0? 1: 0); - type = I_CONSTANT; break; - case LT_op: a_symp->s_int = (strcmp(a->s_str, b_str) < 0? 1: 0); - type = I_CONSTANT; break; - case LE_op: a_symp->s_int = (strcmp(a->s_str, b_str) <= 0? 1: 0); - type = I_CONSTANT; break; - case AND_op: if( (a->s_str[0] != 0) && (b_str[0] != 0)) { - a_symp->s_int = 1; - } else { - a_symp->s_int = 0; - } - type = I_CONSTANT; break; - case OR_op: if( (a->s_str[0] != 0) || (b_str[0] != 0)) { - a_symp->s_int = 1; - } else { - a_symp->s_int = 0; - } - type = I_CONSTANT; break; - } + if (a->s_str == NULL || + (((b->s_type == S_VAR) || (b->s_type == S_CONSTANT)) && b->s_str == NULL)) { + if (a->s_str == NULL) { + sprintf(warn_msg,"variable %s has not yet been assigned a value.\n",a->s_name); + capa_msg(MESSAGE_ERROR,warn_msg); + } + if (((b->s_type == S_VAR) || (b->s_type == S_CONSTANT)) && b->s_str == NULL) { + sprintf(warn_msg,"variable %s has not yet been assigned a value.\n",a->s_name); + capa_msg(MESSAGE_ERROR,warn_msg); + } + } else { /* a is a valid string */ + switch( b->s_type ) { + case I_VAR: + case I_CONSTANT: + leng = SMALL_LINE_BUFFER; /* assuming a long integer does not exceed 128 digits*/ + b_str= capa_malloc(sizeof(char), leng); + sprintf(b_str,"%ld", b->s_int); + break; + case R_VAR: + case R_CONSTANT: + leng = SMALL_LINE_BUFFER;/*assuming a double does not exceed128chars*/ + b_str= capa_malloc(sizeof(char), leng); + sprintf(b_str,"%.15g", b->s_real); + break; + case S_VAR: + case S_CONSTANT: /* DONE: get rid of limitations on b_str[] */ + leng = strlen( b->s_str ) + 1; + b_str= capa_malloc(sizeof(char), leng); + sprintf(b_str,"%s",b->s_str); + /*if(b->s_type == S_CONSTANT) capa_mfree(b->s_str);*/ + break; + } + switch( op ) { + case ADD_op: + leng = strlen( a->s_str ) + strlen(b_str) + 1; + r_strp = capa_malloc(sizeof(char), leng); /* **** */ + strcat(r_strp, a->s_str); + strcat(r_strp, b_str); /* concatenate two strings together */ + if( !new ) capa_mfree(a->s_str); + a_symp->s_str = r_strp; + break; + case SUB_op: + case MUL_op: + case DIV_op: + case IDIV_op: + if( !new ) capa_mfree(a->s_str); + a_symp->s_str = strsave("<>"); + sprintf(warn_msg,"integer division (%%) cannot accept string operand!\n"); + capa_msg(MESSAGE_ERROR,warn_msg); + break; + case EQ_op: a_symp->s_int = (strcmp(a->s_str, b_str) == 0? 1: 0); + type = I_CONSTANT; break; + case NE_op: a_symp->s_int = (strcmp(a->s_str, b_str) == 0? 0: 1); + type = I_CONSTANT; break; + case GT_op: a_symp->s_int = (strcmp(a->s_str, b_str) > 0? 1: 0); + type = I_CONSTANT; break; + case GE_op: a_symp->s_int = (strcmp(a->s_str, b_str) >= 0? 1: 0); + type = I_CONSTANT; break; + case LT_op: a_symp->s_int = (strcmp(a->s_str, b_str) < 0? 1: 0); + type = I_CONSTANT; break; + case LE_op: a_symp->s_int = (strcmp(a->s_str, b_str) <= 0? 1: 0); + type = I_CONSTANT; break; + case AND_op: + if( (a->s_str[0] != 0) && (b_str[0] != 0)) { + a_symp->s_int = 1; + } else { + a_symp->s_int = 0; + } + type = I_CONSTANT; break; + case OR_op: + if( (a->s_str[0] != 0) || (b_str[0] != 0)) { + a_symp->s_int = 1; + } else { + a_symp->s_int = 0; + } + type = I_CONSTANT; break; + } + } if (b_str!=NULL) capa_mfree(b_str); } else { /* b is string and a is either integer or real */ switch( a->s_type ) { @@ -1326,7 +1353,7 @@ char * format_toTeX( real ) char *real; { int idx, length, fraclength, i_exp; - char *expo_p, fracS[SIXTEEN], result[ONE_K], *areal; + char *expo_p, fracS[SMALL_LINE_BUFFER], result[ONE_K], *areal; char warn_msg[WARN_MSG_LENGTH]; length = strlen(real); @@ -1374,7 +1401,7 @@ char * format_toHTML( real ) char *real; { int idx, length, fraclength, i_exp; - char *expo_p, fracS[SIXTEEN], result[ONE_K], *areal; + char *expo_p, fracS[SMALL_LINE_BUFFER], result[ONE_K], *areal; char warn_msg[WARN_MSG_LENGTH]; length = strlen(real); @@ -1487,16 +1514,22 @@ display_var( s )Symbol *s; } } break; - case S_VAR: case S_CONSTANT: - aline = (char *)capa_malloc(strlen(s->s_str)+1,1); - sprintf(aline,"%s",s->s_str); + case S_VAR: case S_CONSTANT: + if (s->s_str == NULL) { + sprintf(warn_msg,"variable %s has not yet been assigned a value.\n", + s->s_name); + capa_msg(MESSAGE_ERROR,warn_msg); + aline=(char *)capa_malloc(9,1); + sprintf(aline,"NO VALUE"); + } else { + aline = (char *)capa_malloc(strlen(s->s_str)+1,1); + sprintf(aline,"%s",s->s_str); + } break; } append_text(aline); capa_mfree((char *)aline); - if(s->s_format) { - capa_mfree((char *)s->s_format); - } + if(s->s_format) { capa_mfree((char *)s->s_format); } s->s_format = NULL; switch(s->s_type) { /* free up spaces taken by constants */ case I_CONSTANT: @@ -1765,6 +1798,30 @@ assign_id_list( s ) Symbol *s; } } +void assign_pts ( Symbol* coord1, Symbol* coord2, Symbol* num) { + PointsList_t *pt; + if( LastPtsList != NULL ) { + LastPtsList->pts_next = gen_ptslist( coord1, coord2, num ); + pt = LastPtsList->pts_next; + while( pt->pts_next != NULL ) { + pt = pt->pts_next; + } + LastPtsList = pt; + } else { + CurrPtsList = gen_ptslist( coord1, coord2, num ); + LastPtsList = CurrPtsList; + } + if(coord1->s_type == S_CONSTANT) { + capa_mfree(coord1->s_str); capa_mfree((char *)coord1); + } + if(coord2->s_type == S_CONSTANT) { + capa_mfree(coord2->s_str); capa_mfree((char *)coord2); + } + if(num->s_type == I_CONSTANT || num->s_type == R_CONSTANT) { + capa_mfree((char *)num); + } +} + /* =========================================================================== */