Mercurial > octave

comparison libinterp/parse-tree/oct-parse.yy @ 31771:21f9b34eb893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.
author Rik <rik@octave.org>
date Tue, 24 Jan 2023 17:19:44 -0800
parents 7f5480cb117f
children 9feb455dd514
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
2423 2423
2424 parse_exception (const parse_exception&) = default; 2424 parse_exception (const parse_exception&) = default;
2425 2425
2426 parse_exception& operator = (const parse_exception&) = default; 2426 parse_exception& operator = (const parse_exception&) = default;
2427 2427
2428 ~parse_exception (void) = default; 2428 ~parse_exception () = default;
2429 2429
2430 std::string message (void) const { return m_message; } 2430 std::string message () const { return m_message; }
2431 2431
2432 // Provided for std::exception interface. 2432 // Provided for std::exception interface.
2433 const char * what (void) const noexcept { return m_message.c_str (); } 2433 const char * what () const noexcept { return m_message.c_str (); }
2434 2434
2435 std::string fcn_name (void) const { return m_fcn_name; } 2435 std::string fcn_name () const { return m_fcn_name; }
2436 std::string file_name (void) const { return m_file_name; } 2436 std::string file_name () const { return m_file_name; }
2437 2437
2438 int line (void) const { return m_line; } 2438 int line () const { return m_line; }
2439 int column (void) const { return m_column; } 2439 int column () const { return m_column; }
2440 2440
2441 // virtual void display (std::ostream& os) const; 2441 // virtual void display (std::ostream& os) const;
2442 2442
2443 private: 2443 private:
2444 2444
2452 2452
2453 class parse_tree_validator : public tree_walker 2453 class parse_tree_validator : public tree_walker
2454 { 2454 {
2455 public: 2455 public:
2456 2456
2457 parse_tree_validator (void) 2457 parse_tree_validator ()
2458 : m_scope (), m_error_list () 2458 : m_scope (), m_error_list ()
2459 { } 2459 { }
2460 2460
2461 parse_tree_validator (const parse_tree_validator&) = delete; 2461 parse_tree_validator (const parse_tree_validator&) = delete;
2462 2462
2463 parse_tree_validator& operator = (const parse_tree_validator&) = delete; 2463 parse_tree_validator& operator = (const parse_tree_validator&) = delete;
2464 2464
2465 ~parse_tree_validator (void) = default; 2465 ~parse_tree_validator () = default;
2466 2466
2467 symbol_scope get_scope (void) const { return m_scope; } 2467 symbol_scope get_scope () const { return m_scope; }
2468 2468
2469 bool ok (void) const { return m_error_list.empty (); } 2469 bool ok () const { return m_error_list.empty (); }
2470 2470
2471 std::list<parse_exception> error_list (void) const 2471 std::list<parse_exception> error_list () const
2472 { 2472 {
2473 return m_error_list; 2473 return m_error_list;
2474 } 2474 }
2475 2475
2476 void visit_octave_user_script (octave_user_script& script) 2476 void visit_octave_user_script (octave_user_script& script)
2540 list->append (elt); 2540 list->append (elt);
2541 return list; 2541 return list;
2542 } 2542 }
2543 2543
2544 std::size_t 2544 std::size_t
2545 base_parser::parent_scope_info::size (void) const 2545 base_parser::parent_scope_info::size () const
2546 { 2546 {
2547 return m_info.size (); 2547 return m_info.size ();
2548 } 2548 }
2549 2549
2550 void 2550 void
2558 { 2558 {
2559 push (value_type (scope, "")); 2559 push (value_type (scope, ""));
2560 } 2560 }
2561 2561
2562 void 2562 void
2563 base_parser::parent_scope_info::pop (void) 2563 base_parser::parent_scope_info::pop ()
2564 { 2564 {
2565 m_info.pop_back (); 2565 m_info.pop_back ();
2566 } 2566 }
2567 2567
2568 bool 2568 bool
2614 2614
2615 return true; 2615 return true;
2616 } 2616 }
2617 2617
2618 symbol_scope 2618 symbol_scope
2619 base_parser::parent_scope_info::parent_scope (void) const 2619 base_parser::parent_scope_info::parent_scope () const
2620 { 2620 {
2621 return size () > 1 ? m_info[size()-2].first : symbol_scope (); 2621 return size () > 1 ? m_info[size()-2].first : symbol_scope ();
2622 } 2622 }
2623 2623
2624 std::string 2624 std::string
2625 base_parser::parent_scope_info::parent_name (void) const 2625 base_parser::parent_scope_info::parent_name () const
2626 { 2626 {
2627 return m_info[size()-2].second; 2627 return m_info[size()-2].second;
2628 } 2628 }
2629 2629
2630 void base_parser::parent_scope_info::clear (void) 2630 void base_parser::parent_scope_info::clear ()
2631 { 2631 {
2632 m_info.clear (); 2632 m_info.clear ();
2633 m_all_names.clear (); 2633 m_all_names.clear ();
2634 } 2634 }
2635 2635
2641 m_curr_class_name (), m_curr_package_name (), m_function_scopes (*this), 2641 m_curr_class_name (), m_curr_package_name (), m_function_scopes (*this),
2642 m_primary_fcn (), m_subfunction_names (), m_classdef_object (), 2642 m_primary_fcn (), m_subfunction_names (), m_classdef_object (),
2643 m_stmt_list (), m_lexer (lxr), m_parser_state (yypstate_new ()) 2643 m_stmt_list (), m_lexer (lxr), m_parser_state (yypstate_new ())
2644 { } 2644 { }
2645 2645
2646 base_parser::~base_parser (void) 2646 base_parser::~base_parser ()
2647 { 2647 {
2648 delete &m_lexer; 2648 delete &m_lexer;
2649 2649
2650 // FIXME: Deleting the internal Bison parser state structure does 2650 // FIXME: Deleting the internal Bison parser state structure does
2651 // not clean up any partial parse trees in the event of an interrupt or 2651 // not clean up any partial parse trees in the event of an interrupt or
2657 2657
2658 yypstate_delete (static_cast<yypstate *> (m_parser_state)); 2658 yypstate_delete (static_cast<yypstate *> (m_parser_state));
2659 } 2659 }
2660 2660
2661 void 2661 void
2662 base_parser::reset (void) 2662 base_parser::reset ()
2663 { 2663 {
2664 m_endfunction_found = false; 2664 m_endfunction_found = false;
2665 m_autoloading = false; 2665 m_autoloading = false;
2666 m_fcn_file_from_relative_lookup = false; 2666 m_fcn_file_from_relative_lookup = false;
2667 m_parsing_subfunctions = false; 2667 m_parsing_subfunctions = false;
2799 2799
2800 return ettype == expected || ettype == token::simple_end; 2800 return ettype == expected || ettype == token::simple_end;
2801 } 2801 }
2802 2802
2803 bool 2803 bool
2804 base_parser::push_fcn_symtab (void) 2804 base_parser::push_fcn_symtab ()
2805 { 2805 {
2806 m_curr_fcn_depth++; 2806 m_curr_fcn_depth++;
2807 2807
2808 if (m_max_fcn_depth < m_curr_fcn_depth) 2808 if (m_max_fcn_depth < m_curr_fcn_depth)
2809 m_max_fcn_depth = m_curr_fcn_depth; 2809 m_max_fcn_depth = m_curr_fcn_depth;
2891 2891
2892 return retval; 2892 return retval;
2893 } 2893 }
2894 2894
2895 tree_black_hole * 2895 tree_black_hole *
2896 base_parser::make_black_hole (void) 2896 base_parser::make_black_hole ()
2897 { 2897 {
2898 return new tree_black_hole (); 2898 return new tree_black_hole ();
2899 } 2899 }
2900 2900
2901 // Make a function handle. 2901 // Make a function handle.
4300 4300
4301 return new tree_arg_validation_fcns (fcn_args); 4301 return new tree_arg_validation_fcns (fcn_args);
4302 } 4302 }
4303 4303
4304 void 4304 void
4305 base_parser::recover_from_parsing_function (void) 4305 base_parser::recover_from_parsing_function ()
4306 { 4306 {
4307 m_lexer.m_symtab_context.pop (); 4307 m_lexer.m_symtab_context.pop ();
4308 4308
4309 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 0 4309 if (m_lexer.m_reading_fcn_file && m_curr_fcn_depth == 0
4310 && ! m_parsing_subfunctions) 4310 && ! m_parsing_subfunctions)
5492 { 5492 {
5493 return list_append (list, new tree_decl_elt (id)); 5493 return list_append (list, new tree_decl_elt (id));
5494 } 5494 }
5495 5495
5496 void 5496 void
5497 base_parser::disallow_command_syntax (void) 5497 base_parser::disallow_command_syntax ()
5498 { 5498 {
5499 m_lexer.m_allow_command_syntax = false; 5499 m_lexer.m_allow_command_syntax = false;
5500 } 5500 }
5501 5501
5502 // FIXME: this function partially duplicates do_dbtype in debug.cc. 5502 // FIXME: this function partially duplicates do_dbtype in debug.cc.
5613 5613
5614 bison_error (pe.message (), pe.line (), pe.column ()); 5614 bison_error (pe.message (), pe.line (), pe.column ());
5615 } 5615 }
5616 5616
5617 int 5617 int
5618 parser::run (void) 5618 parser::run ()
5619 { 5619 {
5620 int status = -1; 5620 int status = -1;
5621 5621
5622 yypstate *pstate = static_cast<yypstate *> (m_parser_state); 5622 yypstate *pstate = static_cast<yypstate *> (m_parser_state);
5623 5623
5730 5730
5731 return status; 5731 return status;
5732 } 5732 }
5733 5733
5734 int 5734 int
5735 push_parser::run (void) 5735 push_parser::run ()
5736 { 5736 {
5737 if (! m_reader) 5737 if (! m_reader)
5738 error ("push_parser::run requires valid input_reader"); 5738 error ("push_parser::run requires valid input_reader");
5739 5739
5740 int exit_status = 0; 5740 int exit_status = 0;
5802 error ("no such file, '%s'", full_file.c_str ()); 5802 error ("no such file, '%s'", full_file.c_str ());
5803 5803
5804 return octave_value (); 5804 return octave_value ();
5805 } 5805 }
5806 5806
5807 unwind_action act ([=] (void) { ::fclose (ffile); }); 5807 unwind_action act ([=] () { ::fclose (ffile); });
5808 5808
5809 // get the encoding for this folder 5809 // get the encoding for this folder
5810 input_system& input_sys = interp.get_input_system (); 5810 input_system& input_sys = interp.get_input_system ();
5811 parser parser (ffile, interp, input_sys.dir_encoding (dir_name)); 5811 parser parser (ffile, interp, input_sys.dir_encoding (dir_name));
5812 5812
5896 return true; 5896 return true;
5897 } 5897 }
5898 5898
5899 // Check script or function for semantic errors. 5899 // Check script or function for semantic errors.
5900 bool 5900 bool
5901 base_parser::validate_primary_fcn (void) 5901 base_parser::validate_primary_fcn ()
5902 { 5902 {
5903 octave_user_code *code = m_primary_fcn.user_code_value (); 5903 octave_user_code *code = m_primary_fcn.user_code_value ();
5904 5904
5905 if (code) 5905 if (code)
5906 { 5906 {
6634 // function. There's no need to flush here. That has already 6634 // function. There's no need to flush here. That has already
6635 // happened for the normal execution path. If an error happens during 6635 // happened for the normal execution path. If an error happens during
6636 // the eval, then the message is stored in the exception object and we 6636 // the eval, then the message is stored in the exception object and we
6637 // will display it later, after the buffers have been restored. 6637 // will display it later, after the buffers have been restored.
6638 6638
6639 unwind_action act ([=] (void) 6639 unwind_action act ([=] ()
6640 { 6640 {
6641 octave_stdout.rdbuf (old_out_buf); 6641 octave_stdout.rdbuf (old_out_buf);
6642 std::cerr.rdbuf (old_err_buf); 6642 std::cerr.rdbuf (old_err_buf);
6643 }); 6643 });
6644 6644