Merge branch 'master' of github.com:Araq/Nimrod

compiler/ecmasgen.nim

@@ -1141,7 +1141,7 @@ proc genMagic(p: var TProc, n: PNode, r: var TCompRes) =
            [filen, line, mergeExpr(a)])
   of mNew, mNewFinalize: genNew(p, n, r)
   of mSizeOf: r.res = toRope(getSize(n.sons[1].typ))
-  of mChr: gen(p, n.sons[1], r)      # nothing to do
+  of mChr, mArrToSeq: gen(p, n.sons[1], r)      # nothing to do
   of mOrd: genOrd(p, n, r)
   of mLengthStr: unaryExpr(p, n, r, "", "($1.length-1)")
   of mLengthSeq, mLengthOpenArray, mLengthArray:

lib/pure/math.nim

@@ -190,7 +190,7 @@ when not defined(ECMAScript):
 else:  
   proc mathrandom(): float {.importc: "Math.random", nodecl.}
   proc floor*(x: float): float {.importc: "Math.floor", nodecl.}
-  proc random*(max: int): int = return floor(mathrandom() * max)
+  proc random*(max: int): int = return int(floor(mathrandom() * float(max)))
   proc randomize*() = nil
   
   proc sqrt*(x: float): float {.importc: "Math.sqrt", nodecl.}
@@ -204,7 +204,7 @@ else:
   
   proc frexp*(x: float, exponent: var int): float =
     if x == 0.0:
-      exponent = 0.0
+      exponent = 0
       result = 0.0
     elif x < 0.0:
       result = -frexp(-x, exponent)

lib/system/ecmasys.nim

@@ -7,7 +7,8 @@
 #    distribution, for details about the copyright.
 #
 
-proc alert(s: cstring) {.importc, nodecl.}
+proc alert*(s: cstring) {.importc, nodecl.}
+proc log*(s: cstring) {.importc: "console.log", nodecl.}
 
 type
   PSafePoint = ptr TSafePoint

tests/tester.nim

@@ -288,25 +288,25 @@ proc runRodFiles(r: var TResults, options: string) =
   delNimCache()
   
   # test basic recompilation scheme:
-  test "hallo"
+  test "hallo.nim"
-  test "hallo"
+  test "hallo.nim"
   # test incremental type information:
-  test "hallo2"
+  test "hallo2.nim"
   delNimCache()
   
   # test type converters:
-  test "aconv"
+  test "aconv.nim"
-  test "bconv"
+  test "bconv.nim"
   delNimCache()
   
   # test G, A, B example from the documentation; test init sections:
-  test "deada"
+  test "deada.nim"
-  test "deada2"
+  test "deada2.nim"
   delNimCache()
   
   # test method generation:
-  test "bmethods"
+  test "bmethods.nim"
-  test "bmethods2"
+  test "bmethods2.nim"
   delNimCache()