diff options
| author | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
| commit | 5eba93d584d5446256d05f0eef111ace5e12bac3 (patch) | |
| tree | 7b638031f3e77c16ca0c27b9c83630d78846f19e /compiler/ast.nim | |
| parent | 9035d15ed22de1f80486d94ec63e720a4d04cbc0 (diff) | |
| parent | 2264875237cb72cf0288f2bd3d4a930c2a1acc50 (diff) | |
| download | Nim-5eba93d584d5446256d05f0eef111ace5e12bac3.tar.gz | |
Merge branch 'master' into vm2
Conflicts: compiler/sem.nim
Diffstat (limited to 'compiler/ast.nim')
| -rw-r--r-- | compiler/ast.nim | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 9d85e8ff2..1eb5bffc4 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -713,7 +713,6 @@ type # -1 means that the size is unkwown align*: int # the type's alignment requirements loc*: TLoc - testeeName*: PIdent # the test variable in user-defined type classes TPair*{.final.} = object key*, val*: PObject @@ -1089,7 +1088,6 @@ proc assignType(dest, src: PType) = dest.size = src.size dest.align = src.align dest.destructor = src.destructor - dest.testeeName = src.testeeName # this fixes 'type TLock = TSysLock': if src.sym != nil: if dest.sym != nil: |