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/jsgen.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/jsgen.nim')
| -rw-r--r-- | compiler/jsgen.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim index c6b0b194f..ddfc189dd 100644 --- a/compiler/jsgen.nim +++ b/compiler/jsgen.nim @@ -130,7 +130,7 @@ proc mapType(typ: PType): TJSTypeKind = result = etyObject of tyNil: result = etyNull of tyGenericInst, tyGenericParam, tyGenericBody, tyGenericInvokation, tyNone, - tyForward, tyEmpty, tyExpr, tyStmt, tyTypeDesc, tyTypeClasses: + tyForward, tyEmpty, tyExpr, tyStmt, tyStatic, tyTypeDesc, tyTypeClasses: result = etyNone of tyProc: result = etyProc of tyCString: result = etyString |