Mercurial > octave-nkf
comparison scripts/io/importdata.m @ 18532:87dfe4892ef9 stable
importdata.m: Fix non-compliant PCRE regexp causing problems on Mac.
* importdata.m: Use '-' as the first character in a character class to
prevent it being interpreted as defining a range.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 28 Feb 2014 16:55:26 -0800 |
| parents | 95412dcfa707 |
| children | fcd87f68af4f 8d7e760bfa68 |
comparison
equal
deleted
inserted
replaced
| 18531:04b4fb217b1a | 18532:87dfe4892ef9 |
|---|---|
| 174 while (ischar (row = fgetl (fid))) | 174 while (ischar (row = fgetl (fid))) |
| 175 | 175 |
| 176 ## If no delimiter determined yet, make a guess. | 176 ## If no delimiter determined yet, make a guess. |
| 177 if (isempty (delimiter)) | 177 if (isempty (delimiter)) |
| 178 ## This pattern can be fooled, but mostly does the job just fine. | 178 ## This pattern can be fooled, but mostly does the job just fine. |
| 179 delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]', | 179 delim = regexp (row, '[-+\d.eE*ij ]+([^-+\d.ij])[-+\d.ij]', |
| 180 'tokens', 'once'); | 180 'tokens', 'once'); |
| 181 #delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]', | |
| 182 # 'tokens', 'once'); | |
| 181 if (! isempty (delim)) | 183 if (! isempty (delim)) |
| 182 delimiter = delim{1}; | 184 delimiter = delim{1}; |
| 183 endif | 185 endif |
| 184 endif | 186 endif |
| 185 | 187 |