diff options
| author | Jasper Jenkins <jasper.vs.jenkins@gmail.com> | 2019-11-28 14:01:17 -0800 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-11-28 23:01:17 +0100 |
| commit | 9ea55eccbbc61c6e7429c094b6ced41ce5535aeb (patch) | |
| tree | 6501d1808e349caa475d6432df1ea081d0fc61b2 | |
| parent | 0996eb174fdafc2980d21149dae5b5a7c5889dff (diff) | |
| download | Nim-9ea55eccbbc61c6e7429c094b6ced41ce5535aeb.tar.gz | |
make addQuoted work on nimscript (#12717) [backport]
| -rw-r--r-- | lib/system.nim | 11 | ||||
| -rw-r--r-- | tests/compilerapi/myscript.nim | 5 | ||||
| -rw-r--r-- | tests/compilerapi/tcompilerapi.nim | 1 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lib/system.nim b/lib/system.nim index 30277f629..b2325c599 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -3827,11 +3827,6 @@ elif defined(JS): proc deallocShared(p: pointer) = discard proc reallocShared(p: pointer, newsize: Natural): pointer = discard - proc addInt*(result: var string; x: int64) = - result.add $x - - proc addFloat*(result: var string; x: float) = - result.add $x when defined(JS) and not defined(nimscript): include "system/jssys" @@ -3842,6 +3837,12 @@ elif defined(JS): if x < y: return -1 return 1 +when defined(JS) or defined(nimscript): + proc addInt*(result: var string; x: int64) = + result.add $x + + proc addFloat*(result: var string; x: float) = + result.add $x proc quit*(errormsg: string, errorcode = QuitFailure) {.noreturn.} = ## A shorthand for ``echo(errormsg); quit(errorcode)``. diff --git a/tests/compilerapi/myscript.nim b/tests/compilerapi/myscript.nim index 539b07de1..c5d9fe22a 100644 --- a/tests/compilerapi/myscript.nim +++ b/tests/compilerapi/myscript.nim @@ -1,7 +1,12 @@ import exposed +type NumberHolder = object + ival: int + fval: float + echo "top level statements are executed!" +echo NumberHolder(ival: 10, fval: 2.0) proc hostProgramRunsThis*(a, b: float): float = result = addFloats(a, b, 1.0) diff --git a/tests/compilerapi/tcompilerapi.nim b/tests/compilerapi/tcompilerapi.nim index 494765a8b..edeaa2ba5 100644 --- a/tests/compilerapi/tcompilerapi.nim +++ b/tests/compilerapi/tcompilerapi.nim @@ -1,5 +1,6 @@ discard """ output: '''top level statements are executed! +(ival: 10, fval: 2.0) 2.0 my secret 11 |