Mercurial > octave

diff libinterp/parse-tree/oct-parse.yy @ 33260:9a0bf9284128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 06a308cae32c
children 70b7f1c285c7
line wrap: on
line diff
--- 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