diff options
Diffstat (limited to 'limbo')
| -rw-r--r-- | limbo/limbo.y | 4 | ||||
| -rw-r--r-- | limbo/types.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/limbo/limbo.y b/limbo/limbo.y index a6ccab90..f869f01c 100644 --- a/limbo/limbo.y +++ b/limbo/limbo.y @@ -582,13 +582,13 @@ ftype : nids ':' type { $$ = mkids(&$1->src, enter("junk", 0), $3, nil); $$->store = Darg; - yyerror("illegal argument declaraion"); + yyerror("illegal argument declaration"); } | idterms ':' adtk { $$ = mkids(&$1->src, enter("junk", 0), $3, nil); $$->store = Darg; - yyerror("illegal argument declaraion"); + yyerror("illegal argument declaration"); } ; diff --git a/limbo/types.c b/limbo/types.c index 6d231115..c8105d5a 100644 --- a/limbo/types.c +++ b/limbo/types.c @@ -2024,7 +2024,7 @@ cycfield(Type *base, Decl *id) id->sym->name, base); id->cycerr = 1; }else if(arc & ArcCyc){ - if((arc & ArcArray) && id->cyc == 0 && !(arc & ArcPolycyc)){ + if((arc & ArcArray) && oldcycles && id->cyc == 0 && !(arc & ArcPolycyc)){ if(id->cycerr == 0) error(base->src.start, "illegal circular reference to type %T in field %s of %t", id->ty, id->sym->name, base); @@ -3466,7 +3466,7 @@ expandtype(Type *t, Type *instt, Decl *adtt, Tpair **tp) if(t == nil) return nil; -if(debug['w']) print("expandtype %d %lux %T\n", t->kind, (ulong)t, t); +if(debug['w']) print("expandtype %d %#p %T\n", t->kind, t, t); if(!toccurs(t, tp)) return t; if(debug['w']) print("\texpanding\n"); |