mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-03 19:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3733 from yglukhov/js-unicode

Browse Source 
Fixed unicode handling in JS. Fixes #3714.
This commit is contained in:
Andreas Rumpf
2016-01-21 15:30:21 +01:00
parent 72b975d1ff 8fab2f81e3
commit 263ee143f1
2 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/jsgen.nim
View File

@@ -163,8 +163,26 @@ 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: strutils.escape(s).rope)
(if s.isNil: "null".rope else: escapeJSString(s).rope)
include jstypes