Mercurial > octave
diff libinterp/corefcn/regexp.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 14 Aug 2021 22:48:52 -0400 |
parents | 32c3a5805893 |
children | 91c6288781ba 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/corefcn/regexp.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/regexp.cc Sat Aug 14 22:48:52 2021 -0400 @@ -312,7 +312,7 @@ } static void -parse_options (octave::regexp::opts& options, const octave_value_list& args, +parse_options (regexp::opts& options, const octave_value_list& args, const std::string& who, int skip, bool& extra_args) { extra_args = false; @@ -376,13 +376,13 @@ // Rewrite pattern for PCRE pattern = do_regexp_ptn_string_escapes (pattern, args(1).is_sq_string ()); - octave::regexp::opts options; + regexp::opts options; options.case_insensitive (case_insensitive); bool extra_options = false; parse_options (options, args, who, 2, extra_options); - const octave::regexp::match_data rx_lst - = octave::regexp::match (pattern, buffer, options, who); + const regexp::match_data rx_lst + = regexp::match (pattern, buffer, options, who); string_vector named_pats = rx_lst.named_patterns (); @@ -1396,11 +1396,11 @@ } regexpargs.resize (len); - octave::regexp::opts options; + regexp::opts options; bool extra_args = false; parse_options (options, regexpargs, who, 0, extra_args); - return octave::regexp::replace (pattern, buffer, replacement, options, who); + return regexp::replace (pattern, buffer, replacement, options, who); } DEFUN (regexprep, args, ,