diff options
author | Araq <rumpf_a@web.de> | 2012-08-24 19:08:34 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2012-08-24 19:08:34 +0200 |
commit | 8a92e95ccfb2653d8cea52a83c26ac8967557062 (patch) | |
tree | fc7fb79f860dd1d9c32fffb3afcf100454afa0c5 | |
parent | d17caa86e841489d92165d9caa13c2d8bc86afd5 (diff) | |
download | Nim-8a92e95ccfb2653d8cea52a83c26ac8967557062.tar.gz |
made tests green again
-rwxr-xr-x | lib/pure/marshal.nim | 2 | ||||
-rwxr-xr-x | lib/system/threads.nim | 2 | ||||
-rw-r--r-- | tests/reject/tenummix.nim | 2 | ||||
-rwxr-xr-x | tests/run/mmultim3.nim | 2 | ||||
-rwxr-xr-x | tests/run/tmultim1.nim | 2 | ||||
-rwxr-xr-x | tests/run/tmultim2.nim | 2 | ||||
-rwxr-xr-x | tests/run/tofopr.nim | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/pure/marshal.nim b/lib/pure/marshal.nim index e8c30331a..bffc4ebb6 100755 --- a/lib/pure/marshal.nim +++ b/lib/pure/marshal.nim @@ -306,7 +306,7 @@ when isMainModule: testit(test7) type - TA = object + TA {.inheritable.} = object TB = object of TA f: int diff --git a/lib/system/threads.nim b/lib/system/threads.nim index 87411c935..81e0cb00a 100755 --- a/lib/system/threads.nim +++ b/lib/system/threads.nim @@ -165,7 +165,7 @@ type TThreadLocalStorage = array [0..1_000, float] PGcThread = ptr TGcThread - TGcThread {.pure.} = object + TGcThread {.pure, inheritable.} = object sys: TSysThread when emulatedThreadVars and not useStackMaskHack: tls: TThreadLocalStorage diff --git a/tests/reject/tenummix.nim b/tests/reject/tenummix.nim index 55c0c05a9..53be02ffa 100644 --- a/tests/reject/tenummix.nim +++ b/tests/reject/tenummix.nim @@ -1,6 +1,6 @@ discard """ file: "system.nim" - line: 643 + line: 646 errormsg: "type mismatch" """ diff --git a/tests/run/mmultim3.nim b/tests/run/mmultim3.nim index ca73ebea6..3139a8089 100755 --- a/tests/run/mmultim3.nim +++ b/tests/run/mmultim3.nim @@ -1,5 +1,5 @@ type - TObj* = object + TObj* = object {.inheritable.} var myObj* : ref TObj diff --git a/tests/run/tmultim1.nim b/tests/run/tmultim1.nim index 4fcf81c98..7f551aa64 100755 --- a/tests/run/tmultim1.nim +++ b/tests/run/tmultim1.nim @@ -5,7 +5,7 @@ discard """ # Test multi methods type - Expression = ref object + Expression = ref object {.inheritable.} Literal = ref object of Expression x: int PlusExpr = ref object of Expression diff --git a/tests/run/tmultim2.nim b/tests/run/tmultim2.nim index 956b22647..75f652137 100755 --- a/tests/run/tmultim2.nim +++ b/tests/run/tmultim2.nim @@ -5,7 +5,7 @@ discard """ # Test multi methods type - TThing = object + TThing = object {.inheritable.} TUnit = object of TThing x: int TParticle = object of TThing diff --git a/tests/run/tofopr.nim b/tests/run/tofopr.nim index f9c21ad16..961d81bd3 100755 --- a/tests/run/tofopr.nim +++ b/tests/run/tofopr.nim @@ -5,7 +5,7 @@ discard """ # Test is operator type - TMyType = object + TMyType = object {.inheritable.} len: int data: string |