diff options
| author | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
|---|---|---|
| committer | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
| commit | db2f96daba9c04db2f24cb783c79fb37799cd9ea (patch) | |
| tree | 567beb43c7e4549abfcae1ea66e5232d7525e001 /compiler/wordrecg.nim | |
| parent | 3116744c86f37ac4e4e5fec3d6d1635304ed717f (diff) | |
| parent | 84a09d2f5b0866491e55fef0fef541e8cc548852 (diff) | |
| download | Nim-db2f96daba9c04db2f24cb783c79fb37799cd9ea.tar.gz | |
Merge remote-tracking branch 'origin/devel' into initallocator-fix
Diffstat (limited to 'compiler/wordrecg.nim')
| -rw-r--r-- | compiler/wordrecg.nim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/wordrecg.nim b/compiler/wordrecg.nim index 3e0e05a94..b5ffd51c2 100644 --- a/compiler/wordrecg.nim +++ b/compiler/wordrecg.nim @@ -36,6 +36,7 @@ type wColon, wColonColon, wEquals, wDot, wDotDot, wStar, wMinus, wMagic, wThread, wFinal, wProfiler, wObjChecks, + wIntDefine, wStrDefine, wDestroy, @@ -121,7 +122,7 @@ const ":", "::", "=", ".", "..", "*", "-", - "magic", "thread", "final", "profiler", "objchecks", + "magic", "thread", "final", "profiler", "objchecks", "intdefine", "strdefine", "destroy", |