diff options
| author | Charles Blake <cblake@csail.mit.edu> | 2015-02-16 14:55:08 -0500 |
|---|---|---|
| committer | Charles Blake <cblake@csail.mit.edu> | 2015-02-16 14:55:08 -0500 |
| commit | 55840d950562e7db48f9df71e62d443e50f4e881 (patch) | |
| tree | d4a7bc344896f430d9e677edca61243daeaae5fa /lib/core | |
| parent | 629decd1701742daf115c4a550a219af17b488c1 (diff) | |
| parent | 553b9308b7b4e050dca01f6fb4b032a405248310 (diff) | |
| download | Nim-55840d950562e7db48f9df71e62d443e50f4e881.tar.gz | |
Merge ../Nim into devel
Diffstat (limited to 'lib/core')
| -rw-r--r-- | lib/core/locks.nim | 2 | ||||
| -rw-r--r-- | lib/core/macros.nim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/core/locks.nim b/lib/core/locks.nim index 766b7b536..8a809fc84 100644 --- a/lib/core/locks.nim +++ b/lib/core/locks.nim @@ -21,7 +21,7 @@ type ## is performed. Deprecated, do not use anymore! AquireEffect* {.deprecated.} = object of LockEffect ## \ ## effect that denotes that some lock is - ## aquired. Deprecated, do not use anymore! + ## acquired. Deprecated, do not use anymore! ReleaseEffect* {.deprecated.} = object of LockEffect ## \ ## effect that denotes that some lock is ## released. Deprecated, do not use anymore! diff --git a/lib/core/macros.nim b/lib/core/macros.nim index 4c561df70..ddbd7a76f 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -76,7 +76,7 @@ type TNimrodTypeKind* = enum ntyNone, ntyBool, ntyChar, ntyEmpty, ntyArrayConstr, ntyNil, ntyExpr, ntyStmt, - ntyTypeDesc, ntyGenericInvokation, ntyGenericBody, ntyGenericInst, + ntyTypeDesc, ntyGenericInvocation, ntyGenericBody, ntyGenericInst, ntyGenericParam, ntyDistinct, ntyEnum, ntyOrdinal, ntyArray, ntyObject, ntyTuple, ntySet, ntyRange, ntyPtr, ntyRef, ntyVar, |