exp/eval: Fix example and add target to Makefile

R=rsc
CC=golang-dev
https://golang.org/cl/901042

diff --git a/src/pkg/exp/eval/Makefile b/src/pkg/exp/eval/Makefile
index 46445876b08c4365cf8603376a5b152a075f75f5..eac844f1ed4b2751a794f43b3068dd1224627d45 100644 (file)
--- a/src/pkg/exp/eval/Makefile
+++ b/src/pkg/exp/eval/Makefile
@@ -21,3 +21,9 @@ GOFILES=\
        world.go\
 
 include ../../../Make.pkg
+
+main.$O: main.go $(pkgdir)/$(TARG).a
+       $(QUOTED_GOBIN)/$(GC) $<
+
+eval: main.$O
+       $(QUOTED_GOBIN)/$(LD) -o $@ $<

diff --git a/src/pkg/exp/eval/main.go b/src/pkg/exp/eval/main.go
index e7c58ef5b6d73e11b59c102a1c0a65ca9f22b9b5..6033088a39f3b7fa9603110294952e96f8675029 100644 (file)
--- a/src/pkg/exp/eval/main.go
+++ b/src/pkg/exp/eval/main.go
@@ -5,12 +5,12 @@
 package main
 
 import (
-       "./_obj/eval"
        "bufio"
+       "exp/eval"
        "flag"
        "go/parser"
        "go/scanner"
-       "io"
+       "io/ioutil"
        "os"
 )
 
@@ -25,7 +25,7 @@ func main() {
                        println(err.String())
                        os.Exit(1)
                }
-               file, err := parser.ParseFile(*filename, data, 0)
+               file, err := parser.ParseFile(*filename, data, nil, 0)
                if err != nil {
                        println(err.String())
                        os.Exit(1)
@@ -41,7 +41,7 @@ func main() {
                        }
                        os.Exit(1)
                }
-               _, err := code.Run()
+               _, err = code.Run()
                if err != nil {
                        println(err.String())
                        os.Exit(1)