commit e52115d67329c60187c273de22fc47d38e4850bb
author Jacek Caban <jacek@codeweavers.com> Wed Oct 14 14:43:01 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 14 15:10:32 2009 +0200
tree 6fd758b0b82e1926499034220b424f7a3f6e8057
parent 98b5a1c6e81601435838d676d91abc7a7b5c74f2

jscript: Create regexp object when evaluating regexp literal.

dlls/jscript/lex.c

diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c
index efb1782..4e04dea 100644
--- a/dlls/jscript/lex.c
+++ b/dlls/jscript/lex.c
@@ -755,20 +755,10 @@
     return 0;
 }
 
-static void add_object_literal(parser_ctx_t *ctx, DispatchEx *obj)
-{
-    obj_literal_t *literal = parser_alloc(ctx, sizeof(obj_literal_t));
-
-    literal->obj = obj;
-    literal->next = ctx->obj_literals;
-    ctx->obj_literals = literal;
-}
-
 literal_t *parse_regexp(parser_ctx_t *ctx)
 {
     const WCHAR *re, *flags_ptr;
     DWORD re_len, flags;
-    DispatchEx *regexp;
     literal_t *ret;
     HRESULT hres;
 
@@ -798,14 +788,10 @@
     if(FAILED(hres))
         return NULL;
 
-    hres = create_regexp(ctx->script, re, re_len, flags, &regexp);
-    if(FAILED(hres))
-        return NULL;
-
-    add_object_literal(ctx, regexp);
-
     ret = parser_alloc(ctx, sizeof(literal_t));
-    ret->type = LT_DISPATCH;
-    ret->u.disp = (IDispatch*)_IDispatchEx_(regexp);
+    ret->type = LT_REGEXP;
+    ret->u.regexp.str = re;
+    ret->u.regexp.str_len = re_len;
+    ret->u.regexp.flags = flags;
     return ret;
 }