diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-10-02 08:31:38 +0200 |
| commit | e9243a16167b24899d4fcf051f3252b3a5804811 (patch) | |
| tree | dc4733a6f178d4f04ee4da33c50ca807eb7e9dd0 /lib/core | |
| parent | fc7961d4ccd31ab6e7eabbeb7aa22b5488924b4f (diff) | |
| parent | 02ff5f596c330b68927f843814ecb9b86c2eee67 (diff) | |
| download | Nim-e9243a16167b24899d4fcf051f3252b3a5804811.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'lib/core')
| -rw-r--r-- | lib/core/macros.nim | 10 | ||||
| -rw-r--r-- | lib/core/typeinfo.nim | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/core/macros.nim b/lib/core/macros.nim index e88002c7b..8c70d2b47 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -75,7 +75,8 @@ type nnkClosure, nnkGotoState, nnkState, - nnkBreakState + nnkBreakState, + nnkFuncDef NimNodeKinds* = set[NimNodeKind] NimTypeKind* = enum # some types are no longer used, see ast.nim @@ -96,14 +97,14 @@ type ntyError, ntyBuiltinTypeClass, ntyUserTypeClass, ntyUserTypeClassInst, ntyCompositeTypeClass, ntyInferred, ntyAnd, ntyOr, ntyNot, - ntyAnything, ntyStatic, ntyFromExpr, ntyFieldAccessor, ntyVoid + ntyAnything, ntyStatic, ntyFromExpr, ntyOpt, ntyVoid TNimTypeKinds* {.deprecated.} = set[NimTypeKind] NimSymKind* = enum nskUnknown, nskConditional, nskDynLib, nskParam, nskGenericParam, nskTemp, nskModule, nskType, nskVar, nskLet, nskConst, nskResult, - nskProc, nskMethod, nskIterator, + nskProc, nskFunc, nskMethod, nskIterator, nskConverter, nskMacro, nskTemplate, nskField, nskEnumField, nskForVar, nskLabel, nskStub @@ -843,7 +844,8 @@ proc last*(node: NimNode): NimNode {.compileTime.} = node[<node.len] const - RoutineNodes* = {nnkProcDef, nnkMethodDef, nnkDo, nnkLambda, nnkIteratorDef, nnkTemplateDef, nnkConverterDef} + RoutineNodes* = {nnkProcDef, nnkFuncDef, nnkMethodDef, nnkDo, nnkLambda, + nnkIteratorDef, nnkTemplateDef, nnkConverterDef} AtomicNodes* = {nnkNone..nnkNilLit} CallNodes* = {nnkCall, nnkInfix, nnkPrefix, nnkPostfix, nnkCommand, nnkCallStrLit, nnkHiddenCallConv} diff --git a/lib/core/typeinfo.nim b/lib/core/typeinfo.nim index 72b139202..16580b318 100644 --- a/lib/core/typeinfo.nim +++ b/lib/core/typeinfo.nim @@ -54,6 +54,7 @@ type akUInt16 = 42, ## any represents an unsigned in16 akUInt32 = 43, ## any represents an unsigned int32 akUInt64 = 44, ## any represents an unsigned int64 +# akOpt = 44+18 ## the builtin 'opt' type. Any* = object ## can represent any nim value; NOTE: the wrapped ## value can be modified with its wrapper! This means |