Mercurial > hg > octave-lyh
diff src/parse.y @ 4064:b4fa31442a78
[project @ 2002-09-26 21:10:45 by jwe]
| author | jwe |
|---|---|
| date | Thu, 26 Sep 2002 21:10:46 +0000 |
| parents | b79da8779a0e |
| children | 597fbc55ea40 |
line wrap: on
line diff
--- a/src/parse.y +++ b/src/parse.y @@ -391,7 +391,7 @@ %token <tok_val> NAME %token <tok_val> END %token <tok_val> PLOT -%token <tok_val> TEXT STYLE AXES_TAG +%token <tok_val> STRING STYLE AXES_TAG %token <tok_val> FOR WHILE DO UNTIL %token <tok_val> IF ELSEIF ELSE %token <tok_val> SWITCH CASE OTHERWISE @@ -583,8 +583,8 @@ { $$ = make_constant (NUM, $1); } | IMAG_NUM { $$ = make_constant (IMAG_NUM, $1); } - | TEXT - { $$ = make_constant (TEXT, $1); } + | STRING + { $$ = make_constant (STRING, $1); } ; in_matrix_or_assign_lhs @@ -853,14 +853,14 @@ { $$ = make_index_expression ($1, $2, '('); } ; -word_list : TEXT +word_list : STRING { - tree_constant *tmp = make_constant (TEXT, $1); + tree_constant *tmp = make_constant (STRING, $1); $$ = new tree_argument_list (tmp); } - | word_list TEXT + | word_list STRING { - tree_constant *tmp = make_constant (TEXT, $2); + tree_constant *tmp = make_constant (STRING, $2); $1->append (tmp); $$ = $1; } @@ -1860,7 +1860,7 @@ } break; - case TEXT: + case STRING: { octave_value tmp (tok_val->text ()); retval = new tree_constant (tmp, l, c);