ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Added RegExp.lastIndex implementation.

This commit is contained in:
Jacek Caban 2009-08-27 21:33:32 +02:00 committed by Alexandre Julliard
parent a0d262c545
commit 0b939338c8
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/jscript/regexp.c
View File

@ -82,6 +82,7 @@ typedef struct {
JSRegExp *jsregexp;
BSTR str;
DWORD last_index;
} RegExpInstance;
static const WCHAR sourceW[] = {'s','o','u','r','c','e',0};
@ -3471,8 +3472,21 @@ static HRESULT RegExp_multiline(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
FIXME("\n");
return E_NOTIMPL;
TRACE("\n");
switch(flags) {
case DISPATCH_PROPERTYGET: {
RegExpInstance *regexp = (RegExpInstance*)dispex;
V_VT(retv) = VT_I4;
V_I4(retv) = regexp->last_index;
break;
}
default:
FIXME("unimplemented flags: %x\n", flags);
return E_NOTIMPL;
}
return S_OK;
}
static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

7
dlls/jscript/tests/regexp.js
View File

@ -17,7 +17,10 @@
*/
var m;
var m, re;
re = /a+/;
ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex);
m = "abcabc".match(/ca/);
ok(typeof(m) === "object", "typeof m is not object");
@ -208,8 +211,6 @@ ok(r.length === 2, "r.length = " + r.length);
ok(r[0] === "1", "r[0] = " + r[0]);
ok(r[1] === "2", "r[1] = " + r[1]);
var re;
re = /abc[^d]/g;
ok(re.source === "abc[^d]", "re.source = '" + re.source + "', expected 'abc[^d]'");