Mercurial > octave

changeset 33105:b0640dacc4ef bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge default to bytecode-interpreter
author John W. Eaton <jwe@octave.org>
date Wed, 28 Feb 2024 11:59:31 -0500
parents 445396d7edbb (current diff) 4bf13433d79d (diff)
children 613a23f79a1f
files
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.yy	Tue Feb 27 23:52:30 2024 -0500
+++ b/libinterp/parse-tree/oct-parse.yy	Wed Feb 28 11:59:31 2024 -0500
@@ -434,6 +434,13 @@
                     else
                       YYACCEPT;
                   }
+                | file
+                  {
+                    lexer.m_end_of_input = true;
+
+                    $$ = $1;
+                    YYACCEPT;
+                  }
                 | parse_error
                   {
                     $$ = nullptr;
@@ -1038,8 +1045,6 @@
                   { $$ = $1; }
                 | function
                   { $$ = $1; }
-                | file
-                  { $$ = $1; }
                 ;
 
 // ======================
@@ -1525,9 +1530,6 @@
                         lexer.m_symtab_context.pop ();
 
                         delete $3;
-
-                        if (! parser.validate_primary_fcn ())
-                          YYABORT;
                       }
                     else
                       {
@@ -1536,11 +1538,11 @@
                                              $4->beg_pos (), $4->end_pos ());
 
                         parser.make_script ($3, end_of_script);
-
-                        if (! parser.validate_primary_fcn ())
-                          YYABORT;
                       }
 
+                    if (! parser.validate_primary_fcn ())
+                      YYABORT;
+
                     $$ = nullptr;
                   }
                 | begin_file opt_nl classdef parsing_local_fcns opt_sep opt_fcn_list END_OF_INPUT