fix deprecations (#166)

This commit is contained in:
Timothee Cour 2020-01-16 07:18:27 -08:00 • committed by genotrance
commit 6130c04bd8
5 changed files with 11 additions and 14 deletions

View file

@ -10,14 +10,12 @@ addons:
language: c language: c
env: env:
- BRANCH=0.19.6
- BRANCH=0.20.2 - BRANCH=0.20.2
- BRANCH=1.0.4 - BRANCH=1.0.4
- BRANCH=devel - BRANCH=devel
cache: cache:
directories: directories:
- "$HOME/.choosenim/toolchains/nim-0.19.6"
- "$HOME/.choosenim/toolchains/nim-0.20.2" - "$HOME/.choosenim/toolchains/nim-0.20.2"
- "$HOME/.choosenim/toolchains/nim-1.0.4" - "$HOME/.choosenim/toolchains/nim-1.0.4"

View file

@ -9,7 +9,6 @@ matrix:
environment: environment:
matrix: matrix:
- NIM_VERSION: 0.19.6
- NIM_VERSION: 0.20.2 - NIM_VERSION: 0.20.2
- NIM_VERSION: 1.0.4 - NIM_VERSION: 1.0.4

View file

@ -24,7 +24,7 @@ using
var var
when while when while
xor xor
yield""".split(Whitespace).toSet() yield""".split(Whitespace).toHashSet()
const gTypeMap* = { const gTypeMap* = {
# char # char

View file

@ -17,7 +17,7 @@ const
"primitive_type", "primitive_type",
"sized_type_specifier", "sized_type_specifier",
"type_identifier" "type_identifier"
].toSet() ].toHashSet()
gExpressions {.used.} = @[ gExpressions {.used.} = @[
"parenthesized_expression", "parenthesized_expression",
@ -25,7 +25,7 @@ const
"shift_expression", "shift_expression",
"math_expression", "math_expression",
"escape_sequence" "escape_sequence"
].toSet() ].toHashSet()
gEnumVals {.used.} = @[ gEnumVals {.used.} = @[
"identifier", "identifier",

View file

@ -6,17 +6,17 @@ type
parent*: string parent*: string
kind*: NimSymKind kind*: NimSymKind
override*: string override*: string
StringHash = HashSet[string]
OnSymbol* = proc(sym: var Symbol) {.cdecl.} OnSymbol* = proc(sym: var Symbol) {.cdecl.}
OnSymbolOverrideFinal* = proc(typ: string): HashSet[string] {.cdecl.} OnSymbolOverrideFinal* = proc(typ: string): StringHash {.cdecl.}
var var
cOverrides*: Table[string, HashSet[string]] cOverrides*: Table[string, StringHash]
cOverrides = initTable[string, HashSet[string]]() cOverrides = initTable[string, StringHash]()
cOverrides["nskType"] = initSet[string]() cOverrides["nskType"] = StringHash()
cOverrides["nskConst"] = initSet[string]() cOverrides["nskConst"] = StringHash()
cOverrides["nskProc"] = initSet[string]() cOverrides["nskProc"] = StringHash()
proc onSymbolOverrideFinal*(typ: string): HashSet[string] {.exportc, dynlib.} = proc onSymbolOverrideFinal*(typ: string): StringHash {.exportc, dynlib.} =
result = cOverrides[typ] result = cOverrides[typ]