- use new letter definition for pretty

- fixed a bug with error column reporting in the presence of utf-8 chars
- fixed an assertion failure

R=r
OCL=22762
CL=22762

1 files changed, 11 insertions, 9 deletions

diff --git a/usr/gri/pretty/parser.go b/usr/gri/pretty/parser.go
index eaadf105a..4ae58504c 100644
--- a/usr/gri/pretty/parser.go
+++ b/usr/gri/pretty/parser.go
@@ -167,15 +167,17 @@ func (P *Parser) DeclareInScope(scope *AST.Scope, x *AST.Expr, kind int) {
 	if P.scope_lev < 0 {
 		panic("cannot declare objects in other packages");
 	}
-	obj := x.obj;
-	assert(x.tok == Scanner.IDENT && obj.kind == AST.NONE);
-	obj.kind = kind;
-	obj.pnolev = P.scope_lev;
-	if scope.LookupLocal(obj.ident) != nil {
-		P.Error(obj.pos, `"` + obj.ident + `" is declared already`);
-		return;  // don't insert it into the scope
-	}
-	scope.Insert(obj);
+	if x.tok != Scanner.ILLEGAL {  // ignore bad exprs
+		obj := x.obj;
+		assert(x.tok == Scanner.IDENT && obj.kind == AST.NONE);
+		obj.kind = kind;
+		obj.pnolev = P.scope_lev;
+		if scope.LookupLocal(obj.ident) != nil {
+			P.Error(obj.pos, `"` + obj.ident + `" is declared already`);
+			return;  // don't insert it into the scope
+		}
+		scope.Insert(obj);
+	}
 }