Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/lex.ll @ 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 9a85870f2bc1
children f58257a6d18c 6ce905b89cee
comparison
equal deleted inserted replaced
16283:9a85870f2bc1 16284:09881dab3aaf
792 curr_lexer->current_input_column++; 792 curr_lexer->current_input_column++;
793 int retval = curr_lexer->handle_string ('\''); 793 int retval = curr_lexer->handle_string ('\'');
794 return curr_lexer->count_token_internal (retval); 794 return curr_lexer->count_token_internal (retval);
795 } 795 }
796 else 796 else
797 return curr_lexer->count_token (QUOTE); 797 return curr_lexer->count_token (HERMITIAN);
798 } 798 }
799 } 799 }
800 else 800 else
801 { 801 {
802 if (! tok || tok == '[' || tok == '{' || tok == '(' 802 if (! tok || tok == '[' || tok == '{' || tok == '('
806 curr_lexer->current_input_column++; 806 curr_lexer->current_input_column++;
807 int retval = curr_lexer->handle_string ('\''); 807 int retval = curr_lexer->handle_string ('\'');
808 return curr_lexer->count_token_internal (retval); 808 return curr_lexer->count_token_internal (retval);
809 } 809 }
810 else 810 else
811 return curr_lexer->count_token (QUOTE); 811 return curr_lexer->count_token (HERMITIAN);
812 } 812 }
813 } 813 }
814 } 814 }
815 815
816 %{ 816 %{
2722 case EMUL: std::cerr << "EMUL\n"; break; 2722 case EMUL: std::cerr << "EMUL\n"; break;
2723 case EDIV: std::cerr << "EDIV\n"; break; 2723 case EDIV: std::cerr << "EDIV\n"; break;
2724 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break; 2724 case ELEFTDIV: std::cerr << "ELEFTDIV\n"; break;
2725 case EPLUS: std::cerr << "EPLUS\n"; break; 2725 case EPLUS: std::cerr << "EPLUS\n"; break;
2726 case EMINUS: std::cerr << "EMINUS\n"; break; 2726 case EMINUS: std::cerr << "EMINUS\n"; break;
2727 case QUOTE: std::cerr << "QUOTE\n"; break; 2727 case HERMITIAN: std::cerr << "HERMITIAN\n"; break;
2728 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break; 2728 case TRANSPOSE: std::cerr << "TRANSPOSE\n"; break;
2729 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break; 2729 case PLUS_PLUS: std::cerr << "PLUS_PLUS\n"; break;
2730 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break; 2730 case MINUS_MINUS: std::cerr << "MINUS_MINUS\n"; break;
2731 case POW: std::cerr << "POW\n"; break; 2731 case POW: std::cerr << "POW\n"; break;
2732 case EPOW: std::cerr << "EPOW\n"; break; 2732 case EPOW: std::cerr << "EPOW\n"; break;