commit 98b5a1c6e81601435838d676d91abc7a7b5c74f2
author Jacek Caban <jacek@codeweavers.com> Wed Oct 14 14:42:30 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 14 15:10:24 2009 +0200
tree 1b2c1a298d6462eb1c4ca9657e516d20e025a819
parent fa3e6917b49075ac7662a3a8517357497e6d278f

jscript: Separate flags parsing from regexp creating.

dlls/jscript/lex.c

diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index cd53bd9..efb1782 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -766,10 +766,10 @@
 
 literal_t *parse_regexp(parser_ctx_t *ctx)
 {
-    const WCHAR *re, *flags;
+    const WCHAR *re, *flags_ptr;
+    DWORD re_len, flags;
     DispatchEx *regexp;
     literal_t *ret;
-    DWORD re_len;
     HRESULT hres;
 
     TRACE("\n");
@@ -790,11 +790,15 @@
 
     re_len = ctx->ptr-re;
 
-    flags = ++ctx->ptr;
+    flags_ptr = ++ctx->ptr;
     while(ctx->ptr < ctx->end && isalnumW(*ctx->ptr))
         ctx->ptr++;
 
-    hres = create_regexp_str(ctx->script, re, re_len, flags, ctx->ptr-flags, &regexp);
+    hres = parse_regexp_flags(flags_ptr, ctx->ptr-flags_ptr, &flags);
+    if(FAILED(hres))
+        return NULL;
+
+    hres = create_regexp(ctx->script, re, re_len, flags, &regexp);
     if(FAILED(hres))
         return NULL;