Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/oct-parse.in.yy @ 16284:09881dab3aaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Mar 2013 17:20:34 -0400
parents 8c17cd370477
children 3389152014ca
comparison
equal deleted inserted replaced
16283:9a85870f2bc1 16284:09881dab3aaf
204 %token <tok_val> LSHIFT_EQ RSHIFT_EQ LSHIFT RSHIFT 204 %token <tok_val> LSHIFT_EQ RSHIFT_EQ LSHIFT RSHIFT
205 %token <tok_val> EXPR_AND_AND EXPR_OR_OR 205 %token <tok_val> EXPR_AND_AND EXPR_OR_OR
206 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT 206 %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT
207 %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT 207 %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT
208 %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS 208 %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS
209 %token <tok_val> QUOTE TRANSPOSE 209 %token <tok_val> HERMITIAN TRANSPOSE
210 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW 210 %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW
211 %token <tok_val> NUM IMAG_NUM 211 %token <tok_val> NUM IMAG_NUM
212 %token <tok_val> STRUCT_ELT 212 %token <tok_val> STRUCT_ELT
213 %token <tok_val> NAME 213 %token <tok_val> NAME
214 %token <tok_val> END 214 %token <tok_val> END
296 %left LSHIFT RSHIFT 296 %left LSHIFT RSHIFT
297 %left ':' 297 %left ':'
298 %left '-' '+' EPLUS EMINUS 298 %left '-' '+' EPLUS EMINUS
299 %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV 299 %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV
300 %right UNARY EXPR_NOT 300 %right UNARY EXPR_NOT
301 %left POW EPOW QUOTE TRANSPOSE 301 %left POW EPOW HERMITIAN TRANSPOSE
302 %right PLUS_PLUS MINUS_MINUS 302 %right PLUS_PLUS MINUS_MINUS
303 %left '(' '.' '{' 303 %left '(' '.' '{'
304 304
305 // Where to start. 305 // Where to start.
306 %start input 306 %start input
568 { $$ = curr_parser.make_index_expression ($1, $3, '('); } 568 { $$ = curr_parser.make_index_expression ($1, $3, '('); }
569 | oper_expr '{' '}' 569 | oper_expr '{' '}'
570 { $$ = curr_parser.make_index_expression ($1, 0, '{'); } 570 { $$ = curr_parser.make_index_expression ($1, 0, '{'); }
571 | oper_expr '{' arg_list '}' 571 | oper_expr '{' arg_list '}'
572 { $$ = curr_parser.make_index_expression ($1, $3, '{'); } 572 { $$ = curr_parser.make_index_expression ($1, $3, '{'); }
573 | oper_expr QUOTE 573 | oper_expr HERMITIAN
574 { $$ = curr_parser.make_postfix_op (QUOTE, $1, $2); } 574 { $$ = curr_parser.make_postfix_op (HERMITIAN, $1, $2); }
575 | oper_expr TRANSPOSE 575 | oper_expr TRANSPOSE
576 { $$ = curr_parser.make_postfix_op (TRANSPOSE, $1, $2); } 576 { $$ = curr_parser.make_postfix_op (TRANSPOSE, $1, $2); }
577 | oper_expr indirect_ref_op STRUCT_ELT 577 | oper_expr indirect_ref_op STRUCT_ELT
578 { $$ = curr_parser.make_indirect_ref ($1, $3->text ()); } 578 { $$ = curr_parser.make_indirect_ref ($1, $3->text ()); }
579 | oper_expr indirect_ref_op '(' expression ')' 579 | oper_expr indirect_ref_op '(' expression ')'
2115 { 2115 {
2116 octave_value::unary_op t = octave_value::unknown_unary_op; 2116 octave_value::unary_op t = octave_value::unknown_unary_op;
2117 2117
2118 switch (op) 2118 switch (op)
2119 { 2119 {
2120 case QUOTE: 2120 case HERMITIAN:
2121 t = octave_value::op_hermitian; 2121 t = octave_value::op_hermitian;
2122 break; 2122 break;
2123 2123
2124 case TRANSPOSE: 2124 case TRANSPOSE:
2125 t = octave_value::op_transpose; 2125 t = octave_value::op_transpose;