# HG changeset patch # User John W. Eaton # Date 1363036834 14400 # Node ID 09881dab3aaf02716c0a0ff320ff2e884862187e # Parent 9a85870f2bc1fc3dee36f3e6a0f66fd23b4bcf6f * lex.ll, oct-parse.in.yy (HERMITIAN): Rename token from QUOTE. diff --git a/libinterp/parse-tree/lex.h b/libinterp/parse-tree/lex.h --- a/libinterp/parse-tree/lex.h +++ b/libinterp/parse-tree/lex.h @@ -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); diff --git a/libinterp/parse-tree/lex.ll b/libinterp/parse-tree/lex.ll --- a/libinterp/parse-tree/lex.ll +++ b/libinterp/parse-tree/lex.ll @@ -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; diff --git a/libinterp/parse-tree/oct-parse.in.yy b/libinterp/parse-tree/oct-parse.in.yy --- a/libinterp/parse-tree/oct-parse.in.yy +++ b/libinterp/parse-tree/oct-parse.in.yy @@ -206,7 +206,7 @@ %token EXPR_AND EXPR_OR EXPR_NOT %token EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT %token LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS -%token QUOTE TRANSPOSE +%token HERMITIAN TRANSPOSE %token PLUS_PLUS MINUS_MINUS POW EPOW %token NUM IMAG_NUM %token 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;