diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2020-01-16 07:18:27 -0800 |
|---|---|---|
| committer | genotrance <dev@genotrance.com> | 2020-01-16 09:18:27 -0600 |
| commit | 6130c04bd8b239c31398af7b79e068abfdbd43f3 (patch) | |
| tree | f3d31acee4260641b70613645b252b8d502400c9 | |
| parent | b863b1d170f6d442c93eb0774f4a66a2a1f2ba4b (diff) | |
| download | nimterop-6130c04bd8b239c31398af7b79e068abfdbd43f3.tar.gz nimterop-6130c04bd8b239c31398af7b79e068abfdbd43f3.zip | |
fix deprecations (#166)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | nimterop/getters.nim | 2 | ||||
| -rw-r--r-- | nimterop/globals.nim | 4 | ||||
| -rw-r--r-- | nimterop/plugin.nim | 16 |
5 files changed, 11 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 86e5fbc..359d07b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,12 @@ addons: language: c env: - - BRANCH=0.19.6 - BRANCH=0.20.2 - BRANCH=1.0.4 - BRANCH=devel cache: directories: - - "$HOME/.choosenim/toolchains/nim-0.19.6" - "$HOME/.choosenim/toolchains/nim-0.20.2" - "$HOME/.choosenim/toolchains/nim-1.0.4" diff --git a/appveyor.yml b/appveyor.yml index 7678cf1..5651948 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,6 @@ matrix: environment: matrix: - - NIM_VERSION: 0.19.6 - NIM_VERSION: 0.20.2 - NIM_VERSION: 1.0.4 diff --git a/nimterop/getters.nim b/nimterop/getters.nim index ef647e6..885ce2f 100644 --- a/nimterop/getters.nim +++ b/nimterop/getters.nim @@ -24,7 +24,7 @@ using var when while xor -yield""".split(Whitespace).toSet() +yield""".split(Whitespace).toHashSet() const gTypeMap* = { # char diff --git a/nimterop/globals.nim b/nimterop/globals.nim index a868460..52343de 100644 --- a/nimterop/globals.nim +++ b/nimterop/globals.nim @@ -17,7 +17,7 @@ const "primitive_type", "sized_type_specifier", "type_identifier" - ].toSet() + ].toHashSet() gExpressions {.used.} = @[ "parenthesized_expression", @@ -25,7 +25,7 @@ const "shift_expression", "math_expression", "escape_sequence" - ].toSet() + ].toHashSet() gEnumVals {.used.} = @[ "identifier", diff --git a/nimterop/plugin.nim b/nimterop/plugin.nim index 3769142..20d7b78 100644 --- a/nimterop/plugin.nim +++ b/nimterop/plugin.nim @@ -6,17 +6,17 @@ type parent*: string kind*: NimSymKind override*: string - + StringHash = HashSet[string] OnSymbol* = proc(sym: var Symbol) {.cdecl.} - OnSymbolOverrideFinal* = proc(typ: string): HashSet[string] {.cdecl.} + OnSymbolOverrideFinal* = proc(typ: string): StringHash {.cdecl.} var - cOverrides*: Table[string, HashSet[string]] + cOverrides*: Table[string, StringHash] -cOverrides = initTable[string, HashSet[string]]() -cOverrides["nskType"] = initSet[string]() -cOverrides["nskConst"] = initSet[string]() -cOverrides["nskProc"] = initSet[string]() +cOverrides = initTable[string, StringHash]() +cOverrides["nskType"] = StringHash() +cOverrides["nskConst"] = StringHash() +cOverrides["nskProc"] = StringHash() -proc onSymbolOverrideFinal*(typ: string): HashSet[string] {.exportc, dynlib.} = +proc onSymbolOverrideFinal*(typ: string): StringHash {.exportc, dynlib.} = result = cOverrides[typ] |