diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-12-29 17:21:00 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-12-29 17:21:00 +0200 |
| commit | afddae5aaf08a3a3357ec33d0bc82bdba0f5dc08 (patch) | |
| tree | b6bd783f813797dcb5be4abaaade5ad599bb1c5c /compiler/vmgen.nim | |
| parent | 437cfa73abd8fdf878cc2af2c44acbc4b6ec3a56 (diff) | |
| parent | 72291875bf895e8e0d22ab3f375752417b07ed25 (diff) | |
| download | Nim-afddae5aaf08a3a3357ec33d0bc82bdba0f5dc08.tar.gz | |
Merge branch 'upstream' into devel
Conflicts: compiler/ccgutils.nim compiler/msgs.nim compiler/sem.nim compiler/semexprs.nim compiler/seminst.nim compiler/semmagic.nim compiler/semstmts.nim compiler/semtypes.nim compiler/semtypinst.nim compiler/sigmatch.nim compiler/types.nim compiler/vmgen.nim lib/core/macros.nim lib/system.nim tests/reject/tenummix.nim web/news.txt
Diffstat (limited to 'compiler/vmgen.nim')
| -rw-r--r-- | compiler/vmgen.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index 563dbc6d1..6389d0508 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -832,7 +832,7 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest) = const atomicTypes = {tyBool, tyChar, - tyExpr, tyStmt, tyTypeDesc, + tyExpr, tyStmt, tyTypeDesc, tyStatic, tyEnum, tyOrdinal, tyRange, @@ -1039,8 +1039,8 @@ proc getNullValue(typ: PType, info: TLineInfo): PNode = result = newNodeIT(nkUIntLit, info, t) of tyFloat..tyFloat128: result = newNodeIT(nkFloatLit, info, t) - of tyVar, tyPointer, tyPtr, tyCString, tySequence, tyString, tyExpr, - tyStmt, tyTypeDesc, tyRef: + of tyVar, tyPointer, tyPtr, tyCString, tySequence, tyString, tyExpr, + tyStmt, tyTypeDesc, tyStatic, tyRef: result = newNodeIT(nkNilLit, info, t) of tyProc: if t.callConv != ccClosure: |