Mercurial > hg > octave-lyh
comparison src/load-path.cc @ 11032:c9b0a75b02e8
Make all regexp in Octave compatible with both POSIX and PCRE.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Tue, 28 Sep 2010 09:25:14 -0700 |
parents | 1ec2f19857fa |
children | a6ab46b5926f |
comparison
equal
deleted
inserted
replaced
11031:d81b6144c4ba | 11032:c9b0a75b02e8 |
---|---|
2145 p != dir_elts.end (); | 2145 p != dir_elts.end (); |
2146 p++) | 2146 p++) |
2147 { | 2147 { |
2148 std::string dir = *p; | 2148 std::string dir = *p; |
2149 | 2149 |
2150 //dir = regexprep (dir_elts{j}, "//+", "/"); | 2150 //dir = regexprep (dir_elts{j}, '//+', "/"); |
2151 //dir = regexprep (dir, "/$", ""); | 2151 //dir = regexprep (dir, '/$', ""); |
2152 | 2152 |
2153 if (append) | 2153 if (append) |
2154 load_path::append (dir, true); | 2154 load_path::append (dir, true); |
2155 else | 2155 else |
2156 load_path::prepend (dir, true); | 2156 load_path::prepend (dir, true); |
2211 p != dir_elts.end (); | 2211 p != dir_elts.end (); |
2212 p++) | 2212 p++) |
2213 { | 2213 { |
2214 std::string dir = *p; | 2214 std::string dir = *p; |
2215 | 2215 |
2216 //dir = regexprep (dir_elts{j}, "//+", "/"); | 2216 //dir = regexprep (dir_elts{j}, '//+', "/"); |
2217 //dir = regexprep (dir, "/$", ""); | 2217 //dir = regexprep (dir, '/$', ""); |
2218 | 2218 |
2219 if (! load_path::remove (dir)) | 2219 if (! load_path::remove (dir)) |
2220 warning ("rmpath: %s: not found", dir.c_str ()); | 2220 warning ("rmpath: %s: not found", dir.c_str ()); |
2221 else | 2221 else |
2222 need_to_update = true; | 2222 need_to_update = true; |