From a1beeb313fee19b4c9720ca68fde534e2ef587fe Mon Sep 17 00:00:00 2001 From: Araq Date: Sat, 4 Jan 2020 19:33:49 +0100 Subject: [PATCH] fixes #13032 --- lib/pure/math.nim | 4 ++-- lib/system/jssys.nim | 10 +++++----- lib/system/reprjs.nim | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/pure/math.nim b/lib/pure/math.nim index 362472584e55a..7d31912c99517 100644 --- a/lib/pure/math.nim +++ b/lib/pure/math.nim @@ -526,7 +526,7 @@ else: # JS 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 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 arccosh*[T: float32|float64](x: T): T {.importc: "Math.acosh", nodecl.} @@ -772,7 +772,7 @@ when not defined(JS): # C else: # JS proc hypot*(x, y: float32): float32 {.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 floor*(x: float32): float32 {.importc: "Math.floor", nodecl.} proc floor*(x: float64): float64 {.importc: "Math.floor", nodecl.} diff --git a/lib/system/jssys.nim b/lib/system/jssys.nim index b9b0fe586807b..2f3512cfc8d4b 100644 --- a/lib/system/jssys.nim +++ b/lib/system/jssys.nim @@ -150,10 +150,10 @@ proc reraiseException() {.compilerproc, asmNoStackFrame.} = asm "throw lastJSError;" -proc raiseOverflow {.exportc: "raiseOverflow", noreturn, compilerProc.} = +proc raiseOverflow {.exportc: "raiseOverflow", noreturn, compilerproc.} = raise newException(OverflowError, "over- or underflow") -proc raiseDivByZero {.exportc: "raiseDivByZero", noreturn, compilerProc.} = +proc raiseDivByZero {.exportc: "raiseDivByZero", noreturn, compilerproc.} = raise newException(DivByZeroError, "division by zero") proc raiseRangeError() {.compilerproc, noreturn.} = @@ -322,7 +322,7 @@ proc SetMinus(a, b: int): int {.compilerproc, asmNoStackFrame.} = return result; """ -proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerProc.} = +proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerproc.} = asm """ if (`a` == `b`) return 0; if (!`a`) return -1; @@ -337,7 +337,7 @@ proc cmpStrings(a, b: string): int {.asmNoStackFrame, compilerProc.} = proc cmp(x, y: string): int = return cmpStrings(x, y) -proc eqStrings(a, b: string): bool {.asmNoStackFrame, compilerProc.} = +proc eqStrings(a, b: string): bool {.asmNoStackFrame, compilerproc.} = asm """ if (`a` == `b`) return true; if (`a` === null && `b`.length == 0) return true; @@ -681,7 +681,7 @@ const # XXX use JS's native way here proc nimParseBiggestFloat(s: string, number: var BiggestFloat, start = 0): int {. - compilerProc.} = + compilerproc.} = var esign = 1.0 sign = 1.0 diff --git a/lib/system/reprjs.nim b/lib/system/reprjs.nim index fb231bbed7e19..e6dde352b5a0c 100644 --- a/lib/system/reprjs.nim +++ b/lib/system/reprjs.nim @@ -209,7 +209,7 @@ proc reprRecord(o: pointer, typ: PNimType, cl: var ReprClosure): string {.compil reprRecordAux(result, o, typ,cl) -proc reprJSONStringify(p: int): string {.compilerRtl.} = +proc reprJsonStringify(p: int): string {.compilerRtl.} = # As a last resort, use stringify # We use this for tyOpenArray, tyVarargs while genTypeInfo is not implemented var tmp: cstring