diff options
| author | Araq <rumpf_a@web.de> | 2013-02-16 22:54:03 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-02-16 22:54:03 +0100 |
| commit | 8e9b39084c4ed378ef98d3e2d6cc958f976862b4 (patch) | |
| tree | c56ab0ae9432fa430961a6a493ef16c2b20dd485 /lib/system | |
| parent | 5d119f61d167738bcc314b31580c6aef15f2e822 (diff) | |
| parent | 4ad2d27df1ea81db97a06c05ef71f8b6534babfb (diff) | |
| download | Nim-8e9b39084c4ed378ef98d3e2d6cc958f976862b4.tar.gz | |
Merge branch 'master' of github.com:Araq/Nimrod
Diffstat (limited to 'lib/system')
| -rwxr-xr-x | lib/system/jssys.nim (renamed from lib/system/ecmasys.nim) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/system/ecmasys.nim b/lib/system/jssys.nim index f78b7f68c..789e39d6d 100755 --- a/lib/system/ecmasys.nim +++ b/lib/system/jssys.nim @@ -42,7 +42,7 @@ proc nimCharToStr(x: char): string {.compilerproc.} = result = newString(1) result[0] = x -proc getCurrentExceptionMsg(): string = +proc getCurrentExceptionMsg*(): string = if excHandler != nil: return $excHandler.exc.msg return "" @@ -151,7 +151,7 @@ proc cstrToNimstr(c: cstring): string {.noStackFrame, compilerproc.} = return result; """ -proc toEcmaStr(s: string): cstring {.noStackFrame, compilerproc.} = +proc toJSStr(s: string): cstring {.noStackFrame, compilerproc.} = asm """ var len = `s`.length-1; var result = new Array(len); @@ -304,7 +304,7 @@ when defined(kwin): asm """ var buf = ""; for (var i = 0; i < arguments.length; ++i) { - buf += `toEcmaStr`(arguments[i]); + buf += `toJSStr`(arguments[i]); } print(buf); """ @@ -316,7 +316,7 @@ elif defined(nodejs): asm """ var buf = ""; for (var i = 0; i < arguments.length; ++i) { - buf += `toEcmaStr`(arguments[i]); + buf += `toJSStr`(arguments[i]); } console.log(buf); """ @@ -338,7 +338,7 @@ else: if node == nil: raise newException(EIO, "<body> element does not exist yet!") asm """ for (var i = 0; i < arguments.length; ++i) { - var x = `toEcmaStr`(arguments[i]); + var x = `toJSStr`(arguments[i]); `node`.appendChild(document.createTextNode(x)) } """ |