Mercurial > octave

comparison libinterp/parse-tree/oct-parse.yy @ 28857:43ad651cf5a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unnecessary uses of octave:: namespace qualifier Affected files: graphics-init.cc, octave-qscintilla.cc, octave-qobject.h, qt-application.h, workspace-view.cc, call-stack.cc, dynamic-ld.cc, error.cc, error.h, event-manager.h, fcn-info.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics-toolkit.cc, input.cc, load-path.cc, oct-hist.cc, oct-stream.cc, pager.cc, stack-frame.cc, symscope.cc, sysdep.cc, __ode15__.cc, cdef-class.cc, ov-fcn-handle.cc, ov.cc, ov.h, oct-parse.yy, pt-classdef.h, pt-eval.cc, Range.cc, Range.h, dir-ops.h, file-stat.cc, lo-sysdep.cc, lo-utils.cc, oct-glob.cc, and url-transfer.cc.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2020 15:19:15 -0400
parents 1ac5a76ae91d
children dff830c84726
comparison
equal deleted inserted replaced
28855:644644d17b26 28857:43ad651cf5a0
2559 2559
2560 if (m_max_fcn_depth < m_curr_fcn_depth) 2560 if (m_max_fcn_depth < m_curr_fcn_depth)
2561 m_max_fcn_depth = m_curr_fcn_depth; 2561 m_max_fcn_depth = m_curr_fcn_depth;
2562 2562
2563 // Will get a real name later. 2563 // Will get a real name later.
2564 m_lexer.m_symtab_context.push (octave::symbol_scope ("parser:push_fcn_symtab")); 2564 m_lexer.m_symtab_context.push (symbol_scope ("parser:push_fcn_symtab"));
2565 m_function_scopes.push (m_lexer.m_symtab_context.curr_scope ()); 2565 m_function_scopes.push (m_lexer.m_symtab_context.curr_scope ());
2566 2566
2567 if (! m_lexer.m_reading_script_file && m_curr_fcn_depth == 0 2567 if (! m_lexer.m_reading_script_file && m_curr_fcn_depth == 0
2568 && ! m_parsing_subfunctions) 2568 && ! m_parsing_subfunctions)
2569 { 2569 {
3581 3581
3582 delete id; 3582 delete id;
3583 return nullptr; 3583 return nullptr;
3584 } 3584 }
3585 3585
3586 octave::symbol_scope curr_scope = m_lexer.m_symtab_context.curr_scope (); 3586 symbol_scope curr_scope = m_lexer.m_symtab_context.curr_scope ();
3587 curr_scope.cache_name (id_name); 3587 curr_scope.cache_name (id_name);
3588 3588
3589 m_lexer.m_parsed_function_name.top () = true; 3589 m_lexer.m_parsed_function_name.top () = true;
3590 m_lexer.m_maybe_classdef_get_set_method = false; 3590 m_lexer.m_maybe_classdef_get_set_method = false;
3591 3591
5933 int nargin = args.length (); 5933 int nargin = args.length ();
5934 5934
5935 if (nargin < 1 || nargin > 2) 5935 if (nargin < 1 || nargin > 2)
5936 print_usage (); 5936 print_usage ();
5937 5937
5938 std::string file = args(0).xstring_value ("__parse_file__: expecting filename as argument"); 5938 std::string file
5939 5939 = args(0).xstring_value ("__parse_file__: expecting filename as argument");
5940 std::string full_file 5940
5941 = octave::sys::file_ops::tilde_expand (file); 5941 std::string full_file = octave::sys::file_ops::tilde_expand (file);
5942 5942
5943 full_file = octave::sys::env::make_absolute (full_file); 5943 full_file = octave::sys::env::make_absolute (full_file);
5944 5944
5945 std::string dir_name; 5945 std::string dir_name;
5946 5946