Mercurial > octave-nkf

changeset 18532:87dfe4892ef9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 04b4fb217b1a
children ea0d4dea1a17
files scripts/io/importdata.m
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/io/importdata.m	Fri Feb 28 14:04:41 2014 -0800
+++ b/scripts/io/importdata.m	Fri Feb 28 16:55:26 2014 -0800
@@ -176,8 +176,10 @@
     ## If no delimiter determined yet, make a guess.
     if (isempty (delimiter))
       ## This pattern can be fooled, but mostly does the job just fine.
-      delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]',
-                           'tokens', 'once');
+      delim = regexp (row, '[-+\d.eE*ij ]+([^-+\d.ij])[-+\d.ij]',
+                      'tokens', 'once');
+      #delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]',
+      #                     'tokens', 'once');
       if (! isempty (delim))
         delimiter = delim{1};
       endif