Module: wine Branch: master Commit: 81cb13af7ac9438a50c7a7dd5bcbb6898edf49d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cb13af7ac9438a50c7a7dd5b...
Author: Jacek Caban jacek@codeweavers.com Date: Wed May 25 14:07:56 2016 +0200
jscript: Added RegExp.multiline getter implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/jscript/jsregexp.c | 6 ++++-- dlls/jscript/tests/regexp.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 23ed990..be9f8d8 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -290,8 +290,10 @@ static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_
static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + *r = jsval_bool(!!(regexp_from_jsdisp(jsthis)->jsregexp->flags & REG_MULTILINE)); + return S_OK; }
static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 5cab586..48f65bc 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -662,9 +662,14 @@ ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, "3") =
re = /x/; ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); re = /x/i; ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); re = new RegExp("xxx", "gi"); ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +re = /x/mg; +ok(re.multiline === true, "re.multiline = " + re.multiline);
reportSuccess();