summaryrefslogtreecommitdiff
path: root/src/pkg/exp/eval/main.go
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2009-12-15 15:27:16 -0800
committerRobert Griesemer <gri@golang.org>2009-12-15 15:27:16 -0800
commit881d6064d23d9da5c7ff368bc7d41d271290deff (patch)
tree44d5d948e3f27cc7eff15ec8cd7ee5165d9a7e90 /src/pkg/exp/eval/main.go
parentd9dfea3ebd51cea89fef8afc6b2377c2958b24f1 (diff)
downloadgolang-881d6064d23d9da5c7ff368bc7d41d271290deff.tar.gz
1) Change default gofmt default settings for
parsing and printing to new syntax. Use -oldparser to parse the old syntax, use -oldprinter to print the old syntax. 2) Change default gofmt formatting settings to use tabs for indentation only and to use spaces for alignment. This will make the code alignment insensitive to an editor's tabwidth. Use -spaces=false to use tabs for alignment. 3) Manually changed src/exp/parser/parser_test.go so that it doesn't try to parse the parser's source files using the old syntax (they have new syntax now). 4) gofmt -w src misc test/bench 2nd set of files. R=rsc CC=golang-dev http://codereview.appspot.com/179067
Diffstat (limited to 'src/pkg/exp/eval/main.go')
-rw-r--r--src/pkg/exp/eval/main.go80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/pkg/exp/eval/main.go b/src/pkg/exp/eval/main.go
index 376af6b86..e7c58ef5b 100644
--- a/src/pkg/exp/eval/main.go
+++ b/src/pkg/exp/eval/main.go
@@ -5,32 +5,32 @@
package main
import (
- "./_obj/eval";
- "bufio";
- "flag";
- "go/parser";
- "go/scanner";
- "io";
- "os";
+ "./_obj/eval"
+ "bufio"
+ "flag"
+ "go/parser"
+ "go/scanner"
+ "io"
+ "os"
)
var filename = flag.String("f", "", "file to run")
func main() {
- flag.Parse();
- w := eval.NewWorld();
+ flag.Parse()
+ w := eval.NewWorld()
if *filename != "" {
- data, err := ioutil.ReadFile(*filename);
+ data, err := ioutil.ReadFile(*filename)
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
- file, err := parser.ParseFile(*filename, data, 0);
+ file, err := parser.ParseFile(*filename, data, 0)
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
- code, err := w.CompileDeclList(file.Decls);
+ code, err := w.CompileDeclList(file.Decls)
if err != nil {
if list, ok := err.(scanner.ErrorList); ok {
for _, e := range list {
@@ -39,50 +39,50 @@ func main() {
} else {
println(err.String())
}
- os.Exit(1);
+ os.Exit(1)
}
- _, err := code.Run();
+ _, err := code.Run()
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
- code, err = w.Compile("init()");
+ code, err = w.Compile("init()")
if code != nil {
- _, err := code.Run();
+ _, err := code.Run()
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
}
- code, err = w.Compile("main()");
+ code, err = w.Compile("main()")
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
- _, err = code.Run();
+ _, err = code.Run()
if err != nil {
- println(err.String());
- os.Exit(1);
+ println(err.String())
+ os.Exit(1)
}
- os.Exit(0);
+ os.Exit(0)
}
- r := bufio.NewReader(os.Stdin);
+ r := bufio.NewReader(os.Stdin)
for {
- print("; ");
- line, err := r.ReadString('\n');
+ print("; ")
+ line, err := r.ReadString('\n')
if err != nil {
break
}
- code, err := w.Compile(line);
+ code, err := w.Compile(line)
if err != nil {
- println(err.String());
- continue;
+ println(err.String())
+ continue
}
- v, err := code.Run();
+ v, err := code.Run()
if err != nil {
- println(err.String());
- continue;
+ println(err.String())
+ continue
}
if v != nil {
println(v.String())