From 7322ef5d2a4aefc3f059015dcb8a7860461cb911 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 15 Jun 2015 12:49:45 -0700 Subject: [PATCH] go/types: fix Eval to use correct file set when evaluating an expression This is https://go-review.googlesource.com/10999 which we could not apply in x/tools/go/types because we must not rely on 1.5 features in that repo yet. Change-Id: I9a57cdb7ad4051df278d1fbed90c736df50f426f Reviewed-on: https://go-review.googlesource.com/11125 Reviewed-by: Alan Donovan --- src/go/types/eval.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/go/types/eval.go b/src/go/types/eval.go index c09f2a3ba4..7b42ff1a9d 100644 --- a/src/go/types/eval.go +++ b/src/go/types/eval.go @@ -65,11 +65,7 @@ func Eval(fset *token.FileSet, pkg *Package, pos token.Pos, expr string) (tv Typ } // parse expressions - // BUG(gri) In case of type-checking errors below, the type checker - // doesn't have the correct file set for expr. The correct - // solution requires a ParseExpr that uses the incoming - // file set fset. - node, err := parser.ParseExpr(expr) + node, err := parser.ParseExprFrom(fset, "eval", expr, 0) if err != nil { return TypeAndValue{}, err } -- 2.51.0