Changeset 3905

Timestamp:

Mar 12, 2020, 9:41:30 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed typo in changeset r3904.
• Backslash: Handle undefined escape strings correctly.

File:

• trunk/bin/parseenv.cmd (modified) (3 diffs)

trunk/bin/parseenv.cmd ¶

@@ -20 +20 @@
  *          but are not skipped when being used within strings (should be)
  *        - no symbols can be used within the #define values yet
- *        - strings may include \r \n and \t.
+ *        - strings may include \r \n and \t
+ *        - backslashes must be doubled.
  *
  *    The XML Tag <tinclude name="filename"/> includes textfiles as part of
@@ -395 +396 @@
        /* Check if StrSearch is a substring of StrExclude */
        p2 = POS( StrExclude, Str, pStart);
-       IF (p2 > 0 & p2 < p1) THEN
+       IF (p2 > 0 & p2 <= p1) THEN
        DO
           /* Start after found StrExclude */
-          pStart = p2 + LENGTH( ExcludeStr);
+          pStart = p2 + LENGTH( StrExclude);
           ITERATE;
        END;
@@ -420 +421 @@
  Str = StrReplace( '\r', '0d'x, Str, '\\');
  Str = StrReplace( '\t', '09'x, Str, '\\');
- Str = StrReplace( '\\', '\', Str);
+ /* Remove backslashes of undefined escape strings */
+ Str = StrReplace( '\',  '',    Str, '\\');
+ /* Replace exclude string at last one */
+ Str = StrReplace( '\\', '\',   Str);
 
  RETURN( Str);