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

jscript: Added String.substring implementation.

This commit is contained in:
Jacek Caban 2008-09-21 15:41:02 +02:00 committed by Alexandre Julliard
parent dff4f0b598
commit 5fdf258b1a
2 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dlls/jscript/string.c
View File

@ -367,11 +367,75 @@ static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
return E_NOTIMPL; return E_NOTIMPL;
} }
/* ECMA-262 3rd Edition 15.5.4.15 */
static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{ {
FIXME("\n"); const WCHAR *str;
return E_NOTIMPL; INT start=0, end;
DWORD length;
VARIANT v;
HRESULT hres;
TRACE("\n");
if(is_class(dispex, JSCLASS_STRING)) {
StringInstance *string = (StringInstance*)dispex;
length = string->length;
str = string->str;
}else {
FIXME("not string this not supported\n");
return E_NOTIMPL;
}
if(arg_cnt(dp) >= 1) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v);
if(FAILED(hres))
return hres;
if(V_VT(&v) == VT_I4) {
start = V_I4(&v);
if(start < 0)
start = 0;
else if(start >= length)
start = length;
}else {
start = V_R8(&v) < 0.0 ? 0 : length;
}
}
if(arg_cnt(dp) >= 2) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v);
if(FAILED(hres))
return hres;
if(V_VT(&v) == VT_I4) {
end = V_I4(&v);
if(end < 0)
end = 0;
else if(end > length)
end = length;
}else {
end = V_R8(&v) < 0.0 ? 0 : length;
}
}else {
end = length;
}
if(start > end) {
INT tmp = start;
start = end;
end = tmp;
}
if(retv) {
V_VT(retv) = VT_BSTR;
V_BSTR(retv) = SysAllocStringLen(str+start, end-start);
if(!V_BSTR(retv))
return E_OUTOFMEMORY;
}
return S_OK;
} }
static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

17
dlls/jscript/tests/api.js
View File

@ -43,6 +43,23 @@ ok(tmp === "", "'abc',charAt(-1) = " + tmp);
tmp = "abc".charAt(0,2); tmp = "abc".charAt(0,2);
ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp);
tmp = "abcd".substring(1,3);
ok(tmp === "bc", "'abcd'.substring(1,3) = " + tmp);
tmp = "abcd".substring(-1,3);
ok(tmp === "abc", "'abcd'.substring(-1,3) = " + tmp);
tmp = "abcd".substring(1,6);
ok(tmp === "bcd", "'abcd'.substring(1,6) = " + tmp);
tmp = "abcd".substring(3,1);
ok(tmp === "bc", "'abcd'.substring(3,1) = " + tmp);
tmp = "abcd".substring(2,2);
ok(tmp === "", "'abcd'.substring(2,2) = " + tmp);
tmp = "abcd".substring(true,"3");
ok(tmp === "bc", "'abcd'.substring(true,'3') = " + tmp);
tmp = "abcd".substring(1,3,2);
ok(tmp === "bc", "'abcd'.substring(1,3,2) = " + tmp);
tmp = "abcd".substring();
ok(tmp === "abcd", "'abcd'.substring() = " + tmp);
var arr = new Array(); var arr = new Array();
ok(typeof(arr) === "object", "arr () is not object"); ok(typeof(arr) === "object", "arr () is not object");
ok((arr.length === 0), "arr.length is not 0"); ok((arr.length === 0), "arr.length is not 0");