From 136b4e419bad76498a33c7eaaf467f7fdfc22279 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 12 Jun 2015 16:59:51 -0700 Subject: [PATCH] go/types: revert most recent change - we cannot rely on 1.5 features quite yet Revert "go/types: fix Eval to use correct file set when evaluating an expression" This reverts commit d241a1448bb9a6aeab0697421853a3ab1fbf243c. Change-Id: Ie16c57da2732d8b079108efef100fc956b71f737 Reviewed-on: https://go-review.googlesource.com/11010 Reviewed-by: David Symonds --- go/types/eval.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/go/types/eval.go b/go/types/eval.go index 7b42ff1a..c09f2a3b 100644 --- a/go/types/eval.go +++ b/go/types/eval.go @@ -65,7 +65,11 @@ func Eval(fset *token.FileSet, pkg *Package, pos token.Pos, expr string) (tv Typ } // parse expressions - node, err := parser.ParseExprFrom(fset, "eval", expr, 0) + // 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) if err != nil { return TypeAndValue{}, err }