diff options
author | Juan M Gómez <info@jmgomez.me> | 2023-06-15 17:50:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-15 18:50:00 +0200 |
commit | 4937aa952b35975fdc76a627ab25116d9b38800b (patch) | |
tree | 5bcd7579e9949547fdc0824405cb2e97a9624615 | |
parent | edb64bcff445d9bfbcf715b697256b230f54c14e (diff) | |
download | Nim-4937aa952b35975fdc76a627ab25116d9b38800b.tar.gz |
adds another pass for sets fixes #6259 (#22099)
* adds another pass for sets fixes #6259 * Update tsets.nim removes extra `#`
-rw-r--r-- | compiler/semdata.nim | 2 | ||||
-rw-r--r-- | compiler/semtypes.nim | 4 | ||||
-rw-r--r-- | tests/sets/tsets.nim | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/compiler/semdata.nim b/compiler/semdata.nim index bf0f73f80..ddd8d33ef 100644 --- a/compiler/semdata.nim +++ b/compiler/semdata.nim @@ -168,7 +168,7 @@ type sideEffects*: Table[int, seq[(TLineInfo, PSym)]] # symbol.id index inUncheckedAssignSection*: int importModuleLookup*: Table[int, seq[int]] # (module.ident.id, [module.id]) - skipTypes*: seq[PNode] # used to skip types between passes in type section. So far only used for inheritance. + skipTypes*: seq[PNode] # used to skip types between passes in type section. So far only used for inheritance and sets. template config*(c: PContext): ConfigRef = c.graph.config diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index b342356f8..aa5f0a79b 100644 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -166,7 +166,9 @@ proc semSet(c: PContext, n: PNode, prev: PType): PType = addSonSkipIntLit(result, base, c.idgen) if base.kind in {tyGenericInst, tyAlias, tySink}: base = lastSon(base) if base.kind notin {tyGenericParam, tyGenericInvocation}: - if not isOrdinalType(base, allowEnumWithHoles = true): + if base.kind == tyForward: + c.skipTypes.add n + elif not isOrdinalType(base, allowEnumWithHoles = true): localError(c.config, n.info, errOrdinalTypeExpected % typeToString(base, preferDesc)) elif lengthOrd(c.config, base) > MaxSetElements: localError(c.config, n.info, errSetTooBig) diff --git a/tests/sets/tsets.nim b/tests/sets/tsets.nim index 517c0b89c..3c20a3907 100644 --- a/tests/sets/tsets.nim +++ b/tests/sets/tsets.nim @@ -21,6 +21,10 @@ block: k0, k1, k2, k3, k4, k5, k6, k7, k8, k9, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k120, k121, k122, k123, k124, k125, k126, k127, k128, k129, k130, k131, k132, k133, k134, k135, k136, k137, k138, k139, k140, k141, k142, k143, k144, k145, k146, k147, k148, k149, k150, k151, k152, k153, k154, k155, k156, k157, k158, k159, k160, k161, k162, k163, k164, k165, k166, k167, k168, k169, k170, k171, k172, k173, k174, k175, k176, k177, k178, k179, k180, k181, k182, k183, k184, k185, k186, k187, k188, k189, k190, k191, k192, k193, k194, k195, k196, k197, k198, k199, k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k220, k221, k222, k223, k224, k225, k226, k227, k228, k229, k230, k231, k232, k233, k234, k235, k236, k237, k238, k239, k240, k241, k242, k243, k244, k245, k246, k247, k248, k249 FakeTokTypeRange = range[k2..k101] FakeTokTypes = set[FakeTokTypeRange] + Foo = object + field: set[Bar] #Bug: 6259 + Bar = enum + bar1, bar2, bar3 const toktypes: FakeTokTypes = {FakeTokTypeRange(k2)..pred(k64), k72..k74} |