Changeset 320

Timestamp:

02/01/15 01:10:22 (10 years ago)

Author:

Maciej Komosinski

Message:

Tab \t ignored in param fields (considered whitespace)

File:

• cpp/frams/param/param.cpp (modified) (5 diffs)

cpp/frams/param/param.cpp

@@ -982 +982 @@
         int fields_loaded = 0;
         const char *t, *lin, *end;
-        const char *equals_sign, *comma_sign;
+        const char *equals_sign, *field_end, *next_field;
         char remember;
         const char *quote, *quote2;
@@ -997 +997 @@
         {
                 // processing a single field
+                // "p:name=field_value,  field_name=field_value  , name=value..."
+                //                     ^ ^-t (after)           ^ ^_next_field
+                //                     \_t (before)            \_field_end
                 while (strchr(" \n\r\t", *t)) if (t < end) t++; else return fields_loaded;
 
-                comma_sign = strchrlimit(t, ',', end); if (!comma_sign) comma_sign = end;
-                quote = strchrlimit(t, '\"', comma_sign);
+                field_end = strchrlimit(t, ',', end); if (!field_end) field_end = end;
+                next_field=field_end;
+                while ((field_end>t) && strchr(" \t",field_end[-1])) field_end--;
+                quote = strchrlimit(t, '\"', field_end);
                 if (quote)
                 {
                         quote2 = skipQuoteString(quote + 1, end);
-                        if (quote2 > comma_sign)
+                        if (quote2 > field_end)
                         {
-                                comma_sign = strchrlimit(quote2 + 1, ',', end);
-                                if (!comma_sign) comma_sign = end;
+                                field_end = strchrlimit(quote2 + 1, ',', end);
+                                if (!field_end) next_field = field_end = end;
                         }
                         equals_sign = strchrlimit(t, '=', quote);
@@ -1013 +1018 @@
                 else
                 {
-                        equals_sign = strchrlimit(t, '=', comma_sign);
+                        equals_sign = strchrlimit(t, '=', field_end);
                         quote2 = 0;
                 }
                 if (equals_sign == t) { t++; equals_sign = 0; }
-                if (comma_sign == t)    // skip empty value
+                if (field_end == t)     // skip empty value
                 {
                         t++; i++;
@@ -1054 +1059 @@
                         }
                         else
-                                if (comma_sign < end) valstop = comma_sign; else valstop = end;
+                                if (field_end < end) valstop = field_end; else valstop = end;
 
                         remember = *valstop;
@@ -1068 +1073 @@
                 if (i >= 0) i++;
 #ifdef __CODEGUARD__ 
-                if (comma_sign<end-1) t=comma_sign+1; else return fields_loaded;
+                if (next_field<end-1) t=next_field+1; else return fields_loaded;
 #else
-                t = comma_sign + 1;
+                t = next_field + 1;
 #endif
         }