mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-30 09:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3756 from yglukhov/revert-3733-js-unicode

Browse Source 
Revert "Fixed unicode handling in JS. Fixes #3714."
This commit is contained in:
Andreas Rumpf
2016-01-21 21:50:30 +01:00
parent 1dac302975 5f092520d1
commit 71e4e39295
2 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/jsgen.nim
View File

@@ -163,26 +163,8 @@ proc mangleName(s: PSym): Rope =
add(result, rope(s.id))
s.loc.r = result
proc escapeJSString(s: string): string =
result = newStringOfCap(s.len + s.len shr 2)
result.add("\"")
for c in items(s):
case c
of '\l': result.add("\\n")
of '\r': result.add("\\r")
of '\t': result.add("\\t")
of '\b': result.add("\\b")
of '\a': result.add("\\a")
of '\e': result.add("\\e")
of '\v': result.add("\\v")
of '\\': result.add("\\\\")
of '\'': result.add("\\'")
of '\"': result.add("\\\"")
else: add(result, c)
result.add("\"")
proc makeJSString(s: string): Rope =
(if s.isNil: "null".rope else: escapeJSString(s).rope)
(if s.isNil: "null".rope else: strutils.escape(s).rope)
include jstypes

33
lib/system/jssys.nim
View File

@@ -166,33 +166,14 @@ proc SetConstr() {.varargs, asmNoStackFrame, compilerproc.} =
"""
proc cstrToNimstr(c: cstring): string {.asmNoStackFrame, compilerproc.} =
{.emit: """
var ln = `c`.length;
var result = new Array(ln);
var r = 0;
for (var i = 0; i < ln; ++i) {
var ch = `c`.charCodeAt(i);
if (ch < 128) {
result[r] = ch;
asm """
var result = [];
for (var i = 0; i < `c`.length; ++i) {
result[i] = `c`.charCodeAt(i);
}
else if((ch > 127) && (ch < 2048)) {
result[r] = (ch >> 6) | 192;
++r;
result[r] = (ch & 63) | 128;
}
else {
result[r] = (ch >> 12) | 224;
++r;
result[r] = ((ch >> 6) & 63) | 128;
++r;
result[r] = (ch & 63) | 128;
}
++r;
}
result[r] = 0; // terminating zero
return result;
""".}
result[result.length] = 0; // terminating zero
return result;
"""
proc toJSStr(s: string): cstring {.asmNoStackFrame, compilerproc.} =
asm """