jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #2917

Browse source
This commit is contained in:
yglukhov 2015-06-17 20:56:56 +03:00
commit 5824b1c839
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/system/jssys.nim
View file

@ -175,12 +175,25 @@ proc cstrToNimstr(c: cstring): string {.asmNoStackFrame, compilerproc.} =
proc toJSStr(s: string): cstring {.asmNoStackFrame, compilerproc.} = proc toJSStr(s: string): cstring {.asmNoStackFrame, compilerproc.} =
asm """ asm """
var len = `s`.length-1; var len = `s`.length-1;
var result = new Array(len); var asciiPart = new Array(len);
var fcc = String.fromCharCode; var fcc = String.fromCharCode;
var nonAsciiPart = null;
for (var i = 0; i < len; ++i) { for (var i = 0; i < len; ++i) {
result[i] = fcc(`s`[i]); if (nonAsciiPart !== null) {
nonAsciiPart[i * 2] = "%";
nonAsciiPart[i * 2 + 1] = `s`[i].toString(16);
}
else if (`s`[i] < 128)
asciiPart[i] = fcc(`s`[i]);
else {
asciiPart.length = i;
nonAsciiPart = new Array((len - i) * 2);
--i;
}
} }
return result.join(""); asciiPart = asciiPart.join("");
return (nonAsciiPart === null) ?
asciiPart : asciiPart + decodeURIComponent(nonAsciiPart.join(""));
""" """
proc mnewString(len: int): string {.asmNoStackFrame, compilerproc.} = proc mnewString(len: int): string {.asmNoStackFrame, compilerproc.} =