Mercurial > octave
changeset 33260:9a0bf9284128
rename FCN and FUNC_RET tokens in the lexer and parser
* octave.gperf (FUNCTION): Rename from FCN. Change all uses.
(RETURN): Rename from FUNC_RET. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 27 Mar 2024 23:44:46 -0400 |
| parents | 7fc7e2039f1e |
| children | ab68bff7b8b8 |
| files | libinterp/parse-tree/lex.ll libinterp/parse-tree/oct-parse.yy libinterp/parse-tree/octave.gperf |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Tue Mar 26 11:18:26 2024 -0700 +++ b/libinterp/parse-tree/lex.ll Wed Mar 27 23:44:46 2024 -0400 @@ -3695,7 +3695,7 @@ case OTHERWISE: std::cerr << "OTHERWISE\n"; break; case BREAK: std::cerr << "BREAK\n"; break; case CONTINUE: std::cerr << "CONTINUE\n"; break; - case FUNC_RET: std::cerr << "FUNC_RET\n"; break; + case RETURN: std::cerr << "RETURN\n"; break; case UNWIND: std::cerr << "UNWIND\n"; break; case CLEANUP: std::cerr << "CLEANUP\n"; break; case TRY: std::cerr << "TRY\n"; break; @@ -3705,7 +3705,7 @@ case FCN_HANDLE: std::cerr << "FCN_HANDLE\n"; break; case END_OF_INPUT: std::cerr << "END_OF_INPUT\n\n"; break; case LEXICAL_ERROR: std::cerr << "LEXICAL_ERROR\n\n"; break; - case FCN: std::cerr << "FCN\n"; break; + case FUNCTION: std::cerr << "FUNCTION\n"; break; case INPUT_FILE: std::cerr << "INPUT_FILE\n"; break; case SUPERCLASSREF: std::cerr << "SUPERCLASSREF\n"; break; case METAQUERY: std::cerr << "METAQUERY\n"; break;
--- a/libinterp/parse-tree/oct-parse.yy Tue Mar 26 11:18:26 2024 -0700 +++ b/libinterp/parse-tree/oct-parse.yy Wed Mar 27 23:44:46 2024 -0400 @@ -221,7 +221,7 @@ %token <tok> SPMD %token <tok> IF ELSEIF ELSE %token <tok> SWITCH CASE OTHERWISE -%token <tok> BREAK CONTINUE FUNC_RET +%token <tok> BREAK CONTINUE RETURN %token <tok> UNWIND CLEANUP %token <tok> TRY CATCH %token <tok> GLOBAL PERSISTENT @@ -232,7 +232,7 @@ %token <tok> SUPERCLASSREF %token <tok> FQ_IDENT %token <tok> GET SET -%token <tok> FCN +%token <tok> FUNCTION %token <tok> ARGUMENTS %token <tok> LEXICAL_ERROR %token <tok> END_OF_INPUT @@ -1264,7 +1264,7 @@ if (! ($$ = parser.make_continue_command ($1))) YYABORT; } - | FUNC_RET + | RETURN { $$ = parser.make_return_command ($1); } ; @@ -1562,7 +1562,7 @@ // Function definition // =================== -function_beg : push_fcn_symtab FCN +function_beg : push_fcn_symtab FUNCTION { $$ = $2; if (lexer.m_reading_classdef_file
--- a/libinterp/parse-tree/octave.gperf Tue Mar 26 11:18:26 2024 -0700 +++ b/libinterp/parse-tree/octave.gperf Wed Mar 27 23:44:46 2024 -0400 @@ -114,7 +114,7 @@ enumeration, ENUMERATION, enumeration_kw events, EVENTS, events_kw for, FOR, for_kw -function, FCN, function_kw +function, FUNCTION, function_kw get, GET, get_kw global, GLOBAL, global_kw if, IF, if_kw @@ -123,7 +123,7 @@ parfor, PARFOR, parfor_kw persistent, PERSISTENT, persistent_kw properties, PROPERTIES, properties_kw -return, FUNC_RET, return_kw +return, RETURN, return_kw set, SET, set_kw spmd, SPMD, spmd_kw switch, SWITCH, switch_kw