Skip to content

Commit

Permalink
fixes #13032
Browse files Browse the repository at this point in the history
  • Loading branch information
Araq committed Jan 4, 2020
1 parent 0f6987a commit a1beeb3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions lib/pure/math.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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.}
Expand Down Expand Up @@ -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.}
Expand Down
10 changes: 5 additions & 5 deletions lib/system/jssys.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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.} =
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/system/reprjs.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a1beeb3

Please sign in to comment.