Mercurial > octave
diff libinterp/parse-tree/lex.ll @ 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 | 30afb3804d6e |
| children | 32f4357ac8d9 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Wed Apr 28 22:24:21 2021 -0400 +++ b/libinterp/parse-tree/lex.ll Wed Apr 28 22:57:42 2021 -0400 @@ -851,7 +851,7 @@ // Grab text of comment without leading space or comment // characters. - size_t i = 0; + std::size_t i = 0; while (i < yyleng && is_space_or_tab (yytext[i])) i++; @@ -1368,11 +1368,11 @@ { std::string txt = yytext; - size_t at_or_dot_pos = txt.find_first_of ("@."); + std::size_t at_or_dot_pos = txt.find_first_of ("@."); if (at_or_dot_pos != std::string::npos) { - size_t spc_pos = txt.find_first_of (" \t"); + std::size_t spc_pos = txt.find_first_of (" \t"); if (spc_pos != std::string::npos && spc_pos < at_or_dot_pos) { @@ -2203,7 +2203,7 @@ symbol_scope lexical_feedback::symbol_table_context::parent_scope (void) const { - size_t sz = size (); + std::size_t sz = size (); return (sz > 1 ? m_frame_stack[1] @@ -2375,7 +2375,7 @@ // Comment characters have been stripped but whitespace // (including newlines) remains. - size_t offset = s.find_first_not_of (" \t\n\r"); + std::size_t offset = s.find_first_not_of (" \t\n\r"); return (offset != std::string::npos && (s.substr (offset, 9) == "Copyright" @@ -2402,15 +2402,15 @@ // If BY_LINES is true, return chunks to the lexer line by line. int - base_lexer::input_buffer::copy_chunk (char *buf, size_t max_size, + base_lexer::input_buffer::copy_chunk (char *buf, std::size_t max_size, bool by_lines) { static const char * const eol = "\n"; - size_t len = 0; + std::size_t len = 0; if (by_lines) { - size_t newline_pos = m_buffer.find ('\n', m_offset); + std::size_t newline_pos = m_buffer.find ('\n', m_offset); len = (newline_pos != std::string::npos ? newline_pos - m_offset + 1 : (max_size > m_chars_left ? m_chars_left : max_size)); @@ -2920,8 +2920,8 @@ bool base_lexer::fq_identifier_contains_keyword (const std::string& s) { - size_t p1 = 0; - size_t p2; + std::size_t p1 = 0; + std::size_t p2; std::string s_part; @@ -3028,14 +3028,14 @@ yytxt.erase (std::remove (yytxt.begin (), yytxt.end (), '_'), yytxt.end ()); - size_t pos = yytxt.find_first_of ("su"); + std::size_t pos = yytxt.find_first_of ("su"); bool unsigned_val = true; int bytes = -1; if (pos == std::string::npos) { - size_t num_digits = yytxt.length (); + std::size_t num_digits = yytxt.length (); if (num_digits <= 8) bytes = 1; @@ -3051,7 +3051,7 @@ unsigned_val = (yytxt[pos] == 'u'); std::string size_str = yytxt.substr (pos+1); yytxt = yytxt.substr (0, pos); - size_t num_digits = yytxt.length (); + std::size_t num_digits = yytxt.length (); if (size_str == "8" && num_digits <= 8) bytes = 1; @@ -3119,7 +3119,7 @@ bool digits_only = true; char *yytxt = flex_yytext (); - size_t yylng = flex_yyleng (); + std::size_t yylng = flex_yyleng (); OCTAVE_LOCAL_BUFFER (char, tmptxt, yylng + 1); char *rp = yytxt; @@ -3236,14 +3236,14 @@ yytxt.erase (std::remove (yytxt.begin (), yytxt.end (), '_'), yytxt.end ()); - size_t pos = yytxt.find_first_of ("su"); + std::size_t pos = yytxt.find_first_of ("su"); bool unsigned_val = true; int bytes = -1; if (pos == std::string::npos) { - size_t num_digits = yytxt.length (); + std::size_t num_digits = yytxt.length (); if (num_digits <= 2) bytes = 1; @@ -3259,7 +3259,7 @@ unsigned_val = (yytxt[pos] == 'u'); std::string size_str = yytxt.substr (pos+1); yytxt = yytxt.substr (0, pos); - size_t num_digits = yytxt.length (); + std::size_t num_digits = yytxt.length (); if (size_str == "8" && num_digits <= 2) bytes = 1; @@ -3428,7 +3428,7 @@ txt.erase (std::remove_if (txt.begin (), txt.end (), is_space_or_tab), txt.end ()); - size_t pos = txt.find ("@"); + std::size_t pos = txt.find ("@"); std::string meth = txt.substr (0, pos); std::string cls = txt.substr (pos + 1); @@ -3675,7 +3675,7 @@ return lval->tok_val; } - size_t + std::size_t base_lexer::pending_token_count (void) const { return m_tokens.size ();