From e1a9b6ee77cf7bb2209cd3868ac8661bd75a9a29 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 12 Sep 2008 12:09:43 -0700 Subject: [PATCH] - updated code to work again with latest 6g version R=r OCL=15235 CL=15235 --- usr/gri/gosrc/verifier.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr/gri/gosrc/verifier.go b/usr/gri/gosrc/verifier.go index 236675ffea..9fc2290b94 100644 --- a/usr/gri/gosrc/verifier.go +++ b/usr/gri/gosrc/verifier.go @@ -35,7 +35,7 @@ func (V *Verifier) VerifyObject(obj *Globals.Object, pnolev int); func (V *Verifier) VerifyType(typ *Globals.Type) { - if V.typs[typ] { + if present, ok := V.typs[typ]; present { return; // already verified } V.typs[typ] = true; @@ -91,7 +91,7 @@ func (V *Verifier) VerifyType(typ *Globals.Type) { func (V *Verifier) VerifyObject(obj *Globals.Object, pnolev int) { - if V.objs[obj] { + if present, ok := V.objs[obj]; present { return; // already verified } V.objs[obj] = true; @@ -126,7 +126,7 @@ func (V *Verifier) VerifyScope(scope *Globals.Scope) { func (V *Verifier) VerifyPackage(pkg *Globals.Package, pno int) { - if V.pkgs[pkg] { + if present, ok := V.pkgs[pkg]; present { return; // already verified } V.pkgs[pkg] = true; @@ -148,8 +148,8 @@ func (V *Verifier) Verify(comp *Globals.Compilation) { for i := 0; i < comp.pkg_ref; i++ { pkg := comp.pkg_list[i]; // each pkg filename must appear only once - if filenames[pkg.file_name] { - Error("package filename present more then once"); + if present, ok := filenames[pkg.file_name]; present { + Error("package filename present more than once"); } filenames[pkg.file_name] = true; V.VerifyPackage(pkg, i); -- 2.48.1