Merge branch 'devel' into vm_float_casts

2018-10-24 22:16:25 +01:00 · 2018-10-24 22:16:25 +01:00 · 4c53d45674
commit 4c53d45674
parent a54e0703a9 f5a2c6e19d
23 changed files with 251 additions and 53 deletions
--- a/tests/casestmt/tcomputedgoto.nim
+++ b/tests/casestmt/tcomputedgoto.nim
@ -1,16 +1,22 @@
 discard """
  output: '''
 yeah A enumB
+uneven
 yeah A enumB
 yeah CD enumD
+uneven
 yeah CD enumE
 yeah A enumB
+uneven
 yeah CD enumE
 yeah CD enumD
+uneven
 yeah A enumB
 yeah B enumC
+uneven
 yeah A enumB
 yeah A enumB
+uneven
 yeah A enumB
 '''
 """
@ -47,4 +53,7 @@ proc vm() =
    of enumLast: discard
    inc(pc)

+    if pc mod 2 == 1:
+      echo "uneven"
+
 vm()
--- a/tests/concepts/t3330.nim
+++ b/tests/concepts/t3330.nim
@ -1,5 +1,6 @@
 discard """
 errormsg: "type mismatch: got <Bar[system.int]>"
+disabled: "true"
 nimout: '''
 t3330.nim(63, 4) Error: type mismatch: got <Bar[system.int]>
 but expected one of: