diff options
author | Simon Hafner <hafnersimon@gmail.com> | 2015-04-01 06:33:24 +0500 |
---|---|---|
committer | Simon Hafner <hafnersimon@gmail.com> | 2015-04-01 06:33:24 +0500 |
commit | a339cb5ed5e2389ad77ee05d2e553cbf43f279b2 (patch) | |
tree | 91182bc92f2421f95e618fdc2d0375022f3839eb /compiler/ast.nim | |
parent | 06b7892ed0878f06c54fa178a07d9844b4fa760f (diff) | |
parent | 165619552a7ad0fa4f594963ee0441dd711edfd4 (diff) | |
download | Nim-a339cb5ed5e2389ad77ee05d2e553cbf43f279b2.tar.gz |
Merge branch 'devel' into jpoirier-realtimeGCTest
Diffstat (limited to 'compiler/ast.nim')
-rw-r--r-- | compiler/ast.nim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index d94f09ccb..10f2a71da 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -529,7 +529,7 @@ type TMagic* = enum # symbols that require compiler magic: mNone, mDefined, mDefinedInScope, mCompiles, - mLow, mHigh, mSizeOf, mTypeTrait, mIs, mOf, mAddr, mTypeOf, + mLow, mHigh, mSizeOf, mTypeTrait, mIs, mOf, mAddr, mTypeOf, mRoof, mEcho, mShallowCopy, mSlurp, mStaticExec, mParseExprToAst, mParseStmtToAst, mExpandToAst, mQuoteAst, mUnaryLt, mInc, mDec, mOrd, mNew, mNewFinalize, mNewSeq, mLengthOpenArray, @@ -557,6 +557,7 @@ type mIntToStr, mInt64ToStr, mFloatToStr, mCStrToStr, mStrToStr, mEnumToStr, mAnd, mOr, mEqStr, mLeStr, mLtStr, mEqSet, mLeSet, mLtSet, mMulSet, mPlusSet, mMinusSet, mSymDiffSet, mConStrStr, mSlice, + mDotDot, # this one is only necessary to give nice compile time warnings mFields, mFieldPairs, mOmpParFor, mAppendStrCh, mAppendStrStr, mAppendSeqElem, mInRange, mInSet, mRepr, mExit, mSetLengthStr, mSetLengthSeq, |