Mercurial > octave
diff libinterp/parse-tree/oct-parse.yy @ 29654:d13d090cb03a stable
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.
(grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | 32f4357ac8d9 |
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.yy Wed Apr 28 22:23:39 2021 -0400 +++ b/libinterp/parse-tree/oct-parse.yy Wed Apr 28 22:57:42 2021 -0400 @@ -2284,7 +2284,7 @@ namespace octave { - size_t + std::size_t base_parser::parent_scope_info::size (void) const { return m_info.size (); @@ -2318,7 +2318,7 @@ std::string full_name; - for (size_t i = 0; i < size()-1; i++) + for (std::size_t i = 0; i < size()-1; i++) { const value_type& elt = m_info[i]; @@ -3638,7 +3638,7 @@ std::string nm = m_lexer.m_fcn_file_name; - size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ()); + std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ()); if (pos != std::string::npos) nm = m_lexer.m_fcn_file_name.substr (pos+1); @@ -3879,7 +3879,7 @@ std::string nm = m_lexer.m_fcn_file_name; - size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ()); + std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_chars ()); if (pos != std::string::npos) nm = m_lexer.m_fcn_file_name.substr (pos+1); @@ -4400,7 +4400,7 @@ std::string va_type = (type == tree_parameter_list::in ? "varargin" : "varargout"); - size_t len = lst->length (); + std::size_t len = lst->length (); if (len > 0) { @@ -4743,7 +4743,7 @@ // input file in a list. See also functions for managing input // buffers in lex.ll. - size_t len = curr_line.length (); + std::size_t len = curr_line.length (); if (curr_line[len-1] == '\n') curr_line.resize (len-1); @@ -5074,7 +5074,7 @@ std::string file = full_file; - size_t file_len = file.length (); + std::size_t file_len = file.length (); if ((file_len > 4 && file.substr (file_len-4) == ".oct") || (file_len > 4 && file.substr (file_len-4) == ".mex") @@ -5083,7 +5083,7 @@ file = sys::env::base_pathname (file); file = file.substr (0, file.find_last_of ('.')); - size_t pos = file.find_last_of (sys::file_ops::dir_sep_str ()); + std::size_t pos = file.find_last_of (sys::file_ops::dir_sep_str ()); if (pos != std::string::npos) file = file.substr (pos+1); } @@ -5130,7 +5130,7 @@ std::string nm = file_name; - size_t nm_len = nm.length (); + std::size_t nm_len = nm.length (); std::string file; @@ -5145,7 +5145,7 @@ nm = sys::env::base_pathname (file); nm = nm.substr (0, nm.find_last_of ('.')); - size_t pos = nm.find_last_of (sys::file_ops::dir_sep_str ()); + std::size_t pos = nm.find_last_of (sys::file_ops::dir_sep_str ()); if (pos != std::string::npos) nm = nm.substr (pos+1); } @@ -5913,7 +5913,7 @@ std::string dir_name; - size_t file_len = file.length (); + std::size_t file_len = file.length (); if ((file_len > 4 && file.substr (file_len-4) == ".oct") || (file_len > 4 && file.substr (file_len-4) == ".mex") @@ -5922,7 +5922,7 @@ file = octave::sys::env::base_pathname (file); file = file.substr (0, file.find_last_of ('.')); - size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ()); + std::size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ()); if (pos != std::string::npos) { dir_name = file.substr (0, pos);