vbscript: Handle carriage return in more places.

This fixes a regression introduced by 5800c9ed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

vbscript: Handle carriage return in more places.
1bd7dbfb · Zebediah Figura · Alexandre Julliard · 6d35c10a · 1bd7dbfb · 1bd7dbfb
Commit 1bd7dbfb authored Mar 04, 2019 by Zebediah Figura Committed by Alexandre Julliard Mar 05, 2019
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

lex.c dlls/vbscript/lex.c +5 -2

run.c dlls/vbscript/tests/run.c +3 -0

No files found.
--- a/dlls/vbscript/lex.c
+++ b/dlls/vbscript/lex.c
@@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret)
    int len = 0;

    while(ctx->ptr < ctx->end) {
-        if(*ctx->ptr == '\n') {
+        if(*ctx->ptr == '\n' || *ctx->ptr == '\r') {
            FIXME("newline inside string literal\n");
            return 0;
        }
@@ -497,10 +497,13 @@ int parser_lex(void *lval, parser_ctx_t *ctx)
        ret = parse_next_token(lval, ctx);
        if(ret == '_') {
            skip_spaces(ctx);
-            if(*ctx->ptr != '\n') {
+            if(*ctx->ptr != '\n' && *ctx->ptr != '\r') {
                FIXME("'_' not followed by newline\n");
                return 0;
            }
+            if(*ctx->ptr == '\r')
+                ctx->ptr++;
+            if(*ctx->ptr == '\n')
                ctx->ptr++;
            continue;
        }

--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -2481,6 +2481,9 @@ static void run_tests(void)
    SET_EXPECT(global_success_d);
    SET_EXPECT(global_success_i);
    parse_script_a("' comment\r"
+                   "x = _\r3\r"
+                   "x = _\n3\r"
+                   "x = _\r\n3\r"
                   "Sub testsub(arg)\r"
                   "If arg = 1 Then\r\r"
                   "Call reportSuccess()\n\n"