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

fixes #13032

Browse source
This commit is contained in:
Araq 2020-01-04 19:33:49 +01:00
commit a1beeb313f
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/math.nim
View file

@ -526,7 +526,7 @@ else: # JS
proc arcsin*[T: float32|float64](x: T): T {.importc: "Math.asin", nodecl.} proc arcsin*[T: float32|float64](x: T): T {.importc: "Math.asin", nodecl.}
proc arccos*[T: float32|float64](x: T): T {.importc: "Math.acos", nodecl.} proc arccos*[T: float32|float64](x: T): T {.importc: "Math.acos", nodecl.}
proc arctan*[T: float32|float64](x: T): T {.importc: "Math.atan", nodecl.} proc arctan*[T: float32|float64](x: T): T {.importc: "Math.atan", nodecl.}
proc arctan2*[T: float32|float64](y, x: T): T {.importC: "Math.atan2", nodecl.} proc arctan2*[T: float32|float64](y, x: T): T {.importc: "Math.atan2", nodecl.}
proc arcsinh*[T: float32|float64](x: T): T {.importc: "Math.asinh", nodecl.} proc arcsinh*[T: float32|float64](x: T): T {.importc: "Math.asinh", nodecl.}
proc arccosh*[T: float32|float64](x: T): T {.importc: "Math.acosh", nodecl.} proc arccosh*[T: float32|float64](x: T): T {.importc: "Math.acosh", nodecl.}
@ -772,7 +772,7 @@ when not defined(JS): # C
else: # JS else: # JS
proc hypot*(x, y: float32): float32 {.importc: "Math.hypot", varargs, nodecl.} proc hypot*(x, y: float32): float32 {.importc: "Math.hypot", varargs, nodecl.}
proc hypot*(x, y: float64): float64 {.importc: "Math.hypot", varargs, nodecl.} proc hypot*(x, y: float64): float64 {.importc: "Math.hypot", varargs, nodecl.}
proc pow*(x, y: float32): float32 {.importC: "Math.pow", nodecl.} proc pow*(x, y: float32): float32 {.importc: "Math.pow", nodecl.}
proc pow*(x, y: float64): float64 {.importc: "Math.pow", nodecl.} proc pow*(x, y: float64): float64 {.importc: "Math.pow", nodecl.}
proc floor*(x: float32): float32 {.importc: "Math.floor", nodecl.} proc floor*(x: float32): float32 {.importc: "Math.floor", nodecl.}
proc floor*(x: float64): float64 {.importc: "Math.floor", nodecl.} proc floor*(x: float64): float64 {.importc: "Math.floor", nodecl.}

10
lib/system/jssys.nim
View file

@ -150,10 +150,10 @@ proc reraiseException() {.compilerproc, asmNoStackFrame.} =
asm "throw lastJSError;" asm "throw lastJSError;"
proc raiseOverflow {.exportc: "raiseOverflow", noreturn, compilerProc.} = proc raiseOverflow {.exportc: "raiseOverflow", noreturn, compilerproc.} =
raise newException(OverflowError, "over- or underflow") raise newException(OverflowError, "over- or underflow")
proc raiseDivByZero {.exportc: "raiseDivByZero", noreturn, compilerProc.} = proc raiseDivByZero {.exportc: "raiseDivByZero", noreturn, compilerproc.} =
raise newException(DivByZeroError, "division by zero") raise newException(DivByZeroError, "division by zero")
proc raiseRangeError() {.compilerproc, noreturn.} = proc raiseRangeError() {.compilerproc, noreturn.} =
@ -322,7 +322,7 @@ proc SetMinus(a, b: int): int {.compilerproc, asmNoStackFrame.} =
return result; return result;
""" """
proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerProc.} = proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerproc.} =
asm """ asm """
if (`a` == `b`) return 0; if (`a` == `b`) return 0;
if (!`a`) return -1; if (!`a`) return -1;
@ -337,7 +337,7 @@ proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerProc.} =
proc cmp(x, y: string): int = proc cmp(x, y: string): int =
return cmpStrings(x, y) return cmpStrings(x, y)
proc eqStrings(a, b: string): bool {.asmNoStackFrame, compilerProc.} = proc eqStrings(a, b: string): bool {.asmNoStackFrame, compilerproc.} =
asm """ asm """
if (`a` == `b`) return true; if (`a` == `b`) return true;
if (`a` === null && `b`.length == 0) return true; if (`a` === null && `b`.length == 0) return true;
@ -681,7 +681,7 @@ const
# XXX use JS's native way here # XXX use JS's native way here
proc nimParseBiggestFloat(s: string, number: var BiggestFloat, start = 0): int {. proc nimParseBiggestFloat(s: string, number: var BiggestFloat, start = 0): int {.
compilerProc.} = compilerproc.} =
var var
esign = 1.0 esign = 1.0
sign = 1.0 sign = 1.0

2
lib/system/reprjs.nim
View file

@ -209,7 +209,7 @@ proc reprRecord(o: pointer, typ: PNimType, cl: var ReprClosure): string {.compil
reprRecordAux(result, o, typ,cl) reprRecordAux(result, o, typ,cl)
proc reprJSONStringify(p: int): string {.compilerRtl.} = proc reprJsonStringify(p: int): string {.compilerRtl.} =
# As a last resort, use stringify # As a last resort, use stringify
# We use this for tyOpenArray, tyVarargs while genTypeInfo is not implemented # We use this for tyOpenArray, tyVarargs while genTypeInfo is not implemented
var tmp: cstring var tmp: cstring