Mercurial > octave

comparison src/mkoctfile.in.cc @ 29654:d13d090cb03a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 99e3912441ec
children 32f4357ac8d9 7f5bd197fea6
comparison
equal deleted inserted replaced
29652:5068a97f0f39 29654:d13d090cb03a
159 static std::string 159 static std::string
160 replace_prefix (std::string s) 160 replace_prefix (std::string s)
161 { 161 {
162 #if defined (OCTAVE_REPLACE_PREFIX) 162 #if defined (OCTAVE_REPLACE_PREFIX)
163 const std::string match = "${prefix}"; 163 const std::string match = "${prefix}";
164 size_t pos = s.find (match); 164 std::size_t pos = s.find (match);
165 while (pos != std::string::npos ) 165 while (pos != std::string::npos )
166 { 166 {
167 s.replace(pos, match.length (), prepend_octave_exec_home ("")); 167 s.replace(pos, match.length (), prepend_octave_exec_home (""));
168 pos = s.find (match); 168 pos = s.find (match);
169 } 169 }
529 static std::string 529 static std::string
530 basename (const std::string& s, bool strip_path = false) 530 basename (const std::string& s, bool strip_path = false)
531 { 531 {
532 std::string retval; 532 std::string retval;
533 533
534 size_t pos = s.rfind ('.'); 534 std::size_t pos = s.rfind ('.');
535 535
536 if (pos == std::string::npos) 536 if (pos == std::string::npos)
537 retval = s; 537 retval = s;
538 else 538 else
539 retval = s.substr (0, pos); 539 retval = s.substr (0, pos);
540 540
541 if (strip_path) 541 if (strip_path)
542 { 542 {
543 size_t p1 = retval.rfind ('/'), p2 = retval.rfind ('\\'); 543 std::size_t p1 = retval.rfind ('/'), p2 = retval.rfind ('\\');
544 544
545 pos = (p1 != std::string::npos && p2 != std::string::npos 545 pos = (p1 != std::string::npos && p2 != std::string::npos
546 ? std::max (p1, p2) : (p2 != std::string::npos ? p2 : p1)); 546 ? std::max (p1, p2) : (p2 != std::string::npos ? p2 : p1));
547 547
548 if (pos != std::string::npos) 548 if (pos != std::string::npos)
906 // FIXME: should probably do a better job of finding the 906 // FIXME: should probably do a better job of finding the
907 // filename extension instead of just looking at the filename 907 // filename extension instead of just looking at the filename
908 // length. 908 // length.
909 909
910 octfile = outputfile; 910 octfile = outputfile;
911 size_t len = octfile.length (); 911 std::size_t len = octfile.length ();
912 size_t len_ext = output_ext.length (); 912 std::size_t len_ext = output_ext.length ();
913 if (len <= len_ext || octfile.substr (len-len_ext) != output_ext) 913 if (len <= len_ext || octfile.substr (len-len_ext) != output_ext)
914 octfile += output_ext; 914 octfile += output_ext;
915 } 915 }
916 else 916 else
917 octfile = basename (octfile, true) + output_ext; 917 octfile = basename (octfile, true) + output_ext;
955 else 955 else
956 fo.open (dfile.c_str ()); 956 fo.open (dfile.c_str ());
957 #else 957 #else
958 std::ofstream fo (dfile.c_str ()); 958 std::ofstream fo (dfile.c_str ());
959 #endif 959 #endif
960 size_t pos; 960 std::size_t pos;
961 while (! feof (fd)) 961 while (! feof (fd))
962 { 962 {
963 line = get_line (fd); 963 line = get_line (fd);
964 if ((pos = line.rfind (".o:")) != std::string::npos) 964 if ((pos = line.rfind (".o:")) != std::string::npos)
965 { 965 {
966 size_t spos = line.rfind ('/', pos); 966 std::size_t spos = line.rfind ('/', pos);
967 std::string ofile 967 std::string ofile
968 = (spos == std::string::npos 968 = (spos == std::string::npos
969 ? line.substr (0, pos+2) 969 ? line.substr (0, pos+2)
970 : line.substr (spos+1, pos-spos+1)); 970 : line.substr (spos+1, pos-spos+1));
971 fo << "pic/" << ofile << ' ' << ofile << ' ' 971 fo << "pic/" << ofile << ' ' << ofile << ' '
1014 else 1014 else
1015 fo.open (dfile.c_str ()); 1015 fo.open (dfile.c_str ());
1016 #else 1016 #else
1017 std::ofstream fo (dfile.c_str ()); 1017 std::ofstream fo (dfile.c_str ());
1018 #endif 1018 #endif
1019 size_t pos; 1019 std::size_t pos;
1020 while (! feof (fd)) 1020 while (! feof (fd))
1021 { 1021 {
1022 line = get_line (fd); 1022 line = get_line (fd);
1023 if ((pos = line.rfind (".o:")) != std::string::npos) 1023 if ((pos = line.rfind (".o:")) != std::string::npos)
1024 { 1024 {
1025 size_t spos = line.rfind ('/', pos); 1025 std::size_t spos = line.rfind ('/', pos);
1026 std::string ofile 1026 std::string ofile
1027 = (spos == std::string::npos 1027 = (spos == std::string::npos
1028 ? line.substr (0, pos+2) 1028 ? line.substr (0, pos+2)
1029 : line.substr (spos+1, pos-spos+1)); 1029 : line.substr (spos+1, pos-spos+1));
1030 fo << "pic/" << ofile << ' ' << ofile << ' ' 1030 fo << "pic/" << ofile << ' ' << ofile << ' '