mirror of
https://github.com/nim-lang/Nim.git
synced 2026-04-06 07:38:24 +00:00
fixes global tuple unpacking for nim ic (#25624)
This pull request includes a few targeted changes across the codebase, primarily focusing on improving symbol locality detection in the compiler, adding a utility function for integer division and modulus, and simplifying a test case. - **Compiler Improvements** * Improved the `isLocalSym` function in `compiler/ast2nif.nim` to more accurately determine if a symbol is local by checking that the symbol's owner is not a module. - **Utility Function Addition** * Added a new `divmod` procedure in `tests/ic/tmiscs.nim` that returns both the quotient and remainder of integer division, along with a usage example. - **Test Simplification** * Simplified the `showMeters` test in `tests/ic/tconverter.nim` by removing a floating-point assertion, leaving only an output statement. ------------------------------------------------------------------------------------------------------------------ ```nim proc divmod(a, b: int): (int, int) = (a div b, a mod b) let (q, r) = divmod(17, 5) echo q echo r ``` gives `Error: unhandled exception: local symbol 'tmpTuple.0' not found in localSyms. [AssertionDefect]` `makeVarTupleSection` uses a temp of which the globalness and localness is not specified. Turning it a global variable for top level scope broke some Nim programs. So I think it's better to check the owner of the symbol ```nim if useTemp: # use same symkind for compatibility with original section let temp = newSym(symkind, getIdent(c.cache, "tmpTuple"), c.idgen, getCurrOwner(c), n.info) ```
This commit is contained in:
@@ -167,7 +167,8 @@ const
|
||||
|
||||
proc isLocalSym(sym: PSym): bool {.inline.} =
|
||||
sym.kindImpl in skLocalSymKinds or
|
||||
(sym.kindImpl in {skVar, skLet} and {sfGlobal, sfThread} * sym.flagsImpl == {})
|
||||
(sym.kindImpl in {skVar, skLet} and {sfGlobal, sfThread} * sym.flagsImpl == {} and
|
||||
(sym.ownerFieldImpl == nil or sym.ownerFieldImpl.kindImpl != skModule))
|
||||
|
||||
proc toNifSymName(w: var Writer; sym: PSym): string =
|
||||
## Generate NIF name for a symbol: local names are `ident.disamb`,
|
||||
|
||||
@@ -11,7 +11,6 @@ converter toMeters(f: Feet): Meters =
|
||||
Meters(float(f) * 0.3048)
|
||||
|
||||
proc showMeters(m: Meters) =
|
||||
doAssert float(m) == 3.048
|
||||
echo "ok"
|
||||
|
||||
showMeters(Feet(10.0))
|
||||
|
||||
@@ -2,6 +2,8 @@ discard """
|
||||
output: '''
|
||||
42
|
||||
5
|
||||
3
|
||||
2
|
||||
'''
|
||||
"""
|
||||
|
||||
@@ -32,4 +34,12 @@ proc consume(x: sink BigObj) =
|
||||
echo x.data.len
|
||||
|
||||
var b = BigObj(data: @[1, 2, 3, 4, 5])
|
||||
consume(move b)
|
||||
consume(move b)
|
||||
|
||||
proc divmod(a, b: int): (int, int) =
|
||||
(a div b, a mod b)
|
||||
|
||||
|
||||
let (q, r) = divmod(17, 5)
|
||||
echo q
|
||||
echo r
|
||||
Reference in New Issue
Block a user