mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-29 17:34:43 +00:00
* Nil checking * Enable current older not nil checking again, run new checking only under flag, skip our test * Enable tests, work on try/except and bugs, fix notnil tests * Enable strictNotNil tests (currently with lowercase category) and add some expected output * Work on try/except/finally: still some things unclear and a lot of code can raise out of try * Fix the notnil build by going back to the old version of a test which I shouldn't have changed * Fix test : use action compile * Work on mutation and aliasing: not finished * Render var parititions graph, try to understand it, fix a nilcheck if bug * Rebase, progress on working with partitions * Improve time logic * Fix some bugs, use graph indices instead of symbol in nil map * Fix bugs, test simpler ident aliasing for now, support two mutation levels * Support ContentMutation and ReAssignment: for now just detect possible re assignment for var parameters of calls * Enable several simple passing tests * Cleanup a bit, fix condition/branch infix-related bug * Remove some files, address some comments by Araq * Use internalError and no quit for now * Separate tests with expected warnings and with expected ok, fix a bug with if with a single branch related to copyMap * Fix new data structures, bugs: make tests pass, disable some for now * Work on fixing errors with non-sym nodes, aliasing: tests fail * Work on alias support: simple set-based logic, todo more tests and ref sets? * Use ref sets: TODO can we think of handle seq-s similar to varpartitions' Araq ones * Handle defers in one place, stop raising in reverse to make an async test compile with strictNotNil, add a commented out test * Dot expressions: call/reassignment. Other refactorings and distinct, SeqOfDistinct support. Checkout an older varpartitions * Work on field tracking * Backup : trying to fix bugs when running some stdlib stuff for running an async test * Start a section about strict not nil checking in experimental manual * Fix experimental strict not nil manual section and move it to another file based on Araq feedback * Fix unstructured flow and double warning problems, fix manual, cleanup * Fix if/elif/else : take in account structure according to Araq feedback * Refactor a bit * Work on bracket expr support, re-enable tests, clarify in manual/tests/implementation static index support for now * Work on compiling stdlib and compiler with strictNotNil * Small fixes to the manual for strictNotNil * Fix idgen for strict check nil rebase * Enable some simple tests, remove old stuff, comment out code/print * Copy the original varpartitions source instead of my changes * Remove some files
115 lines
3.4 KiB
Nim
115 lines
3.4 KiB
Nim
#
|
|
#
|
|
# The Nim Compiler
|
|
# (c) Copyright 2012 Andreas Rumpf
|
|
#
|
|
# See the file "copying.txt", included in this
|
|
# distribution, for details about the copyright.
|
|
#
|
|
|
|
# Implements a table from trees to trees. Does structural equivalence checking.
|
|
|
|
import
|
|
hashes, ast, astalgo, types
|
|
|
|
proc hashTree*(n: PNode): Hash =
|
|
if n.isNil:
|
|
return
|
|
result = ord(n.kind)
|
|
case n.kind
|
|
of nkEmpty, nkNilLit, nkType:
|
|
discard
|
|
of nkIdent:
|
|
result = result !& n.ident.h
|
|
of nkSym:
|
|
result = result !& n.sym.id
|
|
of nkCharLit..nkUInt64Lit:
|
|
if (n.intVal >= low(int)) and (n.intVal <= high(int)):
|
|
result = result !& int(n.intVal)
|
|
of nkFloatLit..nkFloat64Lit:
|
|
if (n.floatVal >= - 1000000.0) and (n.floatVal <= 1000000.0):
|
|
result = result !& toInt(n.floatVal)
|
|
of nkStrLit..nkTripleStrLit:
|
|
result = result !& hash(n.strVal)
|
|
else:
|
|
for i in 0..<n.len:
|
|
result = result !& hashTree(n[i])
|
|
result = !$result
|
|
#echo "hashTree ", result
|
|
#echo n
|
|
|
|
proc treesEquivalent(a, b: PNode): bool =
|
|
if a == b:
|
|
result = true
|
|
elif (a != nil) and (b != nil) and (a.kind == b.kind):
|
|
case a.kind
|
|
of nkEmpty, nkNilLit, nkType: result = true
|
|
of nkSym: result = a.sym.id == b.sym.id
|
|
of nkIdent: result = a.ident.id == b.ident.id
|
|
of nkCharLit..nkUInt64Lit: result = a.intVal == b.intVal
|
|
of nkFloatLit..nkFloat64Lit: result = a.floatVal == b.floatVal
|
|
of nkStrLit..nkTripleStrLit: result = a.strVal == b.strVal
|
|
else:
|
|
if a.len == b.len:
|
|
for i in 0..<a.len:
|
|
if not treesEquivalent(a[i], b[i]): return
|
|
result = true
|
|
if result: result = sameTypeOrNil(a.typ, b.typ)
|
|
|
|
proc nodeTableRawGet(t: TNodeTable, k: Hash, key: PNode): int =
|
|
var h: Hash = k and high(t.data)
|
|
while t.data[h].key != nil:
|
|
if (t.data[h].h == k) and treesEquivalent(t.data[h].key, key):
|
|
return h
|
|
h = nextTry(h, high(t.data))
|
|
result = -1
|
|
|
|
proc nodeTableGet*(t: TNodeTable, key: PNode): int =
|
|
var index = nodeTableRawGet(t, hashTree(key), key)
|
|
if index >= 0: result = t.data[index].val
|
|
else: result = low(int)
|
|
|
|
proc nodeTableRawInsert(data: var TNodePairSeq, k: Hash, key: PNode,
|
|
val: int) =
|
|
var h: Hash = k and high(data)
|
|
while data[h].key != nil: h = nextTry(h, high(data))
|
|
assert(data[h].key == nil)
|
|
data[h].h = k
|
|
data[h].key = key
|
|
data[h].val = val
|
|
|
|
proc nodeTablePut*(t: var TNodeTable, key: PNode, val: int) =
|
|
var n: TNodePairSeq
|
|
var k: Hash = hashTree(key)
|
|
var index = nodeTableRawGet(t, k, key)
|
|
if index >= 0:
|
|
assert(t.data[index].key != nil)
|
|
t.data[index].val = val
|
|
else:
|
|
if mustRehash(t.data.len, t.counter):
|
|
newSeq(n, t.data.len * GrowthFactor)
|
|
for i in 0..high(t.data):
|
|
if t.data[i].key != nil:
|
|
nodeTableRawInsert(n, t.data[i].h, t.data[i].key, t.data[i].val)
|
|
swap(t.data, n)
|
|
nodeTableRawInsert(t.data, k, key, val)
|
|
inc(t.counter)
|
|
|
|
proc nodeTableTestOrSet*(t: var TNodeTable, key: PNode, val: int): int =
|
|
var n: TNodePairSeq
|
|
var k: Hash = hashTree(key)
|
|
var index = nodeTableRawGet(t, k, key)
|
|
if index >= 0:
|
|
assert(t.data[index].key != nil)
|
|
result = t.data[index].val
|
|
else:
|
|
if mustRehash(t.data.len, t.counter):
|
|
newSeq(n, t.data.len * GrowthFactor)
|
|
for i in 0..high(t.data):
|
|
if t.data[i].key != nil:
|
|
nodeTableRawInsert(n, t.data[i].h, t.data[i].key, t.data[i].val)
|
|
swap(t.data, n)
|
|
nodeTableRawInsert(t.data, k, key, val)
|
|
result = val
|
|
inc(t.counter)
|