diff options
Diffstat (limited to 'appl')
| -rw-r--r-- | appl/acme/ecmd.b | 4 | ||||
| -rw-r--r-- | appl/cmd/limbo/limbo.y | 4 | ||||
| -rw-r--r-- | appl/cmd/limbo/types.b | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/appl/acme/ecmd.b b/appl/acme/ecmd.b index e05c4e47..19e38eb3 100644 --- a/appl/acme/ecmd.b +++ b/appl/acme/ecmd.b @@ -1192,7 +1192,7 @@ filematch(f: ref File, r: ref String): int { buf: string; w: ref Window; - match, i, dirty: int; + match, dirty: int; s: Rangeset; # compile expr first so if we get an error, we haven't allocated anything @@ -1203,7 +1203,7 @@ filematch(f: ref File, r: ref String): int dirty = !w.isdir && !w.isscratch && f.mod; buf = sprint("%c%c%c %s\n", " '"[dirty], '+', " ."[curtext!=nil && curtext.file==f], f.name); - (match, s) = rxexecute(nil, buf, 0, i); + (match, s) = rxexecute(nil, buf, 0, len buf); buf = nil; return match; } diff --git a/appl/cmd/limbo/limbo.y b/appl/cmd/limbo/limbo.y index 2f7d3ba8..4eb4af8a 100644 --- a/appl/cmd/limbo/limbo.y +++ b/appl/cmd/limbo/limbo.y @@ -655,13 +655,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/appl/cmd/limbo/types.b b/appl/cmd/limbo/types.b index 6b1802e5..2ee207b3 100644 --- a/appl/cmd/limbo/types.b +++ b/appl/cmd/limbo/types.b @@ -1775,7 +1775,7 @@ cycfield(base: ref Type, id: ref Decl) +id.sym.name+" of "+stypeconv(base)); id.cycerr = byte 1; }else if(arc & ArcCyc){ - if((arc & ArcArray) && id.cyc == byte 0 && !(arc & ArcPolycyc)){ + if((arc & ArcArray) && oldcycles && id.cyc == byte 0 && !(arc & ArcPolycyc)){ if(id.cycerr == byte 0) error(base.src.start, "illegal circular reference to type "+typeconv(id.ty) +" in field "+id.sym.name+" of "+stypeconv(base)); |