Mercurial > octave-nkf
changeset 16284:09881dab3aaf
* 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 | 9a85870f2bc1 |
| children | 3389152014ca |
| files | libinterp/parse-tree/lex.h libinterp/parse-tree/lex.ll libinterp/parse-tree/oct-parse.in.yy |
| diffstat | 3 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.h Mon Mar 11 17:17:48 2013 -0400 +++ b/libinterp/parse-tree/lex.h Mon Mar 11 17:20:34 2013 -0400 @@ -513,8 +513,6 @@ int handle_close_bracket (int bracket_type); - bool next_token_can_follow_bin_op (void); - bool looks_like_command_arg (void); int handle_superclass_identifier (void);
--- a/libinterp/parse-tree/lex.ll Mon Mar 11 17:17:48 2013 -0400 +++ b/libinterp/parse-tree/lex.ll Mon Mar 11 17:20:34 2013 -0400 @@ -794,7 +794,7 @@ return curr_lexer->count_token_internal (retval); } else - return curr_lexer->count_token (QUOTE); + return curr_lexer->count_token (HERMITIAN); } } else @@ -808,7 +808,7 @@ return curr_lexer->count_token_internal (retval); } else - return curr_lexer->count_token (QUOTE); + return curr_lexer->count_token (HERMITIAN); } } } @@ -2724,7 +2724,7 @@ case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break; case EPLUS: std::cerr << "EPLUS\n"; break; case EMINUS: std::cerr << "EMINUS\n"; break; - case QUOTE: std::cerr << "QUOTE\n"; break; + case HERMITIAN: std::cerr << "HERMITIAN\n"; break; case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break; case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break; case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
--- a/libinterp/parse-tree/oct-parse.in.yy Mon Mar 11 17:17:48 2013 -0400 +++ b/libinterp/parse-tree/oct-parse.in.yy Mon Mar 11 17:20:34 2013 -0400 @@ -206,7 +206,7 @@ %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT %token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS -%token <tok_val> QUOTE TRANSPOSE +%token <tok_val> HERMITIAN TRANSPOSE %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW %token <tok_val> NUM IMAG_NUM %token <tok_val> STRUCT_ELT @@ -298,7 +298,7 @@ %left '-' '+' EPLUS EMINUS %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV %right UNARY EXPR_NOT -%left POW EPOW QUOTE TRANSPOSE +%left POW EPOW HERMITIAN TRANSPOSE %right PLUS_PLUS MINUS_MINUS %left '(' '.' '{' @@ -570,8 +570,8 @@ { $$ = curr_parser.make_index_expression ($1, 0, '{'); } | oper_expr '{' arg_list '}' { $$ = curr_parser.make_index_expression ($1, $3, '{'); } - | oper_expr QUOTE - { $$ = curr_parser.make_postfix_op (QUOTE, $1, $2); } + | oper_expr HERMITIAN + { $$ = curr_parser.make_postfix_op (HERMITIAN, $1, $2); } | oper_expr TRANSPOSE { $$ = curr_parser.make_postfix_op (TRANSPOSE, $1, $2); } | oper_expr indirect_ref_op STRUCT_ELT @@ -2117,7 +2117,7 @@ switch (op) { - case QUOTE: + case HERMITIAN: t = octave_value::op_hermitian; break;