Mercurial > octave
diff libinterp/corefcn/symscope.h @ 29572:aef11bb4e6d1
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc,
Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc,
debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc,
fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc,
graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc,
latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc,
mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h,
pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h,
stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h,
symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc,
audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc,
cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc,
ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h,
ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll,
oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc,
pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc,
pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h,
Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc,
oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc,
mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc,
action-container.cc, action-container.h, base-list.h, caseless-str.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h,
file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h,
lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc,
quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc,
and shared-fcns.h.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | e2e493712818 55eeb7f0850b |
line wrap: on
line diff
--- a/libinterp/corefcn/symscope.h Wed Apr 28 22:24:21 2021 -0400 +++ b/libinterp/corefcn/symscope.h Wed Apr 28 22:57:42 2021 -0400 @@ -85,7 +85,7 @@ ~symbol_scope_rep (void) = default; - size_t num_symbols (void) const { return m_symbols.size (); } + std::size_t num_symbols (void) const { return m_symbols.size (); } // Simply inserts symbol. No non-local searching. @@ -95,9 +95,9 @@ bool is_nested (void) const { return m_nesting_depth > 0; } - size_t nesting_depth (void) const { return m_nesting_depth; } + std::size_t nesting_depth (void) const { return m_nesting_depth; } - void set_nesting_depth (size_t depth) { m_nesting_depth = depth; } + void set_nesting_depth (std::size_t depth) { m_nesting_depth = depth; } bool is_parent (void) const { return ! m_children.empty (); } @@ -141,12 +141,12 @@ return new_sid; } - octave_value& persistent_varref (size_t data_offset) + octave_value& persistent_varref (std::size_t data_offset) { return m_persistent_values[data_offset]; } - octave_value persistent_varval (size_t data_offset) const + octave_value persistent_varval (std::size_t data_offset) const { auto p = m_persistent_values.find (data_offset); @@ -294,7 +294,7 @@ void update_nest (void); - bool look_nonlocal (const std::string& name, size_t offset, + bool look_nonlocal (const std::string& name, std::size_t offset, symbol_record& result); octave_value dump_symbols_map (void) const; @@ -327,7 +327,7 @@ std::map<std::string, octave_value> m_subfunctions; //! Map from data offset to persistent values in this scope. - std::map<size_t, octave_value> m_persistent_values; + std::map<std::size_t, octave_value> m_persistent_values; //! The list of subfunctions (if any) in the order they appear in //! the function file. @@ -369,7 +369,7 @@ //! If true, then this scope belongs to a nested function. - size_t m_nesting_depth; + std::size_t m_nesting_depth; //! If true then no variables can be added. @@ -404,7 +404,7 @@ explicit operator bool () const { return bool (m_rep); } - size_t num_symbols (void) const + std::size_t num_symbols (void) const { return m_rep ? m_rep->num_symbols () : 0; } @@ -430,13 +430,13 @@ return m_rep ? m_rep->is_parent () : false; } - void set_nesting_depth (size_t depth) + void set_nesting_depth (std::size_t depth) { if (m_rep) m_rep->set_nesting_depth (depth); } - size_t nesting_depth (void) const + std::size_t nesting_depth (void) const { return m_rep ? m_rep->nesting_depth () : 0; } @@ -467,14 +467,14 @@ return symbol_scope (m_rep ? m_rep->dup () : nullptr); } - octave_value& persistent_varref (size_t data_offset) + octave_value& persistent_varref (std::size_t data_offset) { static octave_value dummy_value; return m_rep ? m_rep->persistent_varref (data_offset) : dummy_value; } - octave_value persistent_varval (size_t data_offset) const + octave_value persistent_varval (std::size_t data_offset) const { return m_rep ? m_rep->persistent_varval (data_offset) : octave_value (); } @@ -676,7 +676,7 @@ m_rep->update_nest (); } - bool look_nonlocal (const std::string& name, size_t offset, + bool look_nonlocal (const std::string& name, std::size_t offset, symbol_record& result) { return m_rep ? m_rep->look_nonlocal (name, offset, result) : false;