diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-07-18 09:46:30 +0200 |
| commit | 4389409e2657e4cec098180299b2d41b1a3a40f7 (patch) | |
| tree | bdeb765d6687ec0aa175d6cbef3458b18b76b1d1 /compiler/ast.nim | |
| parent | 32afdc09c6e2e6b32566df9e70cb71ae43eb9355 (diff) | |
| parent | 6eedac3207cad9f7b4bfe8d631a9373a91b85846 (diff) | |
| download | Nim-4389409e2657e4cec098180299b2d41b1a3a40f7.tar.gz | |
fix merge conflict
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 7cc785ad7..279ed5a08 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -322,7 +322,8 @@ const usesEffects* = 1 # read effects at position 1 writeEffects* = 2 # write effects at position 2 tagEffects* = 3 # user defined tag ('gc', 'time' etc.) - effectListLen* = 4 # list of effects list + pragmasEffects* = 4 # not an effect, but a slot for pragmas in proc type + effectListLen* = 5 # list of effects list type TTypeKind* = enum # order is important! |