summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2011-08-17 14:55:57 +1000
committerRob Pike <r@golang.org>2011-08-17 14:55:57 +1000
commit773ccb507489b3791c25a42b44e05c944a213c83 (patch)
tree6f6e42e6e40969a9d986ab0bef1b097dbdf60ca9
parent67c1d018c028bfc9987976925adc31bbcf0775ec (diff)
downloadgo-773ccb507489b3791c25a42b44e05c944a213c83.tar.gz
template: move exp/template into template.
(Leave exp/template/html where it is for now.) R=golang-dev, dsymonds CC=golang-dev http://codereview.appspot.com/4899048
Diffstat
-rw-r--r--misc/goplay/goplay.go2
-rw-r--r--src/cmd/godoc/codewalk.go2
-rw-r--r--src/cmd/godoc/format.go2
-rw-r--r--src/cmd/godoc/godoc.go2
-rw-r--r--src/cmd/goinstall/make.go2
-rw-r--r--src/pkg/Makefile4
-rw-r--r--src/pkg/exp/template/html/reverse.go4
-rw-r--r--src/pkg/exp/template/html/reverse_test.go2
-rw-r--r--src/pkg/go/doc/comment.go2
-rw-r--r--src/pkg/rpc/debug.go2
-rw-r--r--src/pkg/template/Makefile (renamed from src/pkg/exp/template/parse/Makefile)11
-rw-r--r--src/pkg/template/doc.go (renamed from src/pkg/exp/template/doc.go)0
-rw-r--r--src/pkg/template/exec.go (renamed from src/pkg/exp/template/exec.go)2
-rw-r--r--src/pkg/template/exec_test.go (renamed from src/pkg/exp/template/exec_test.go)0
-rw-r--r--src/pkg/template/funcs.go (renamed from src/pkg/exp/template/funcs.go)0
-rw-r--r--src/pkg/template/helper.go (renamed from src/pkg/exp/template/helper.go)0
-rw-r--r--src/pkg/template/parse.go (renamed from src/pkg/exp/template/parse.go)2
-rw-r--r--src/pkg/template/parse/Makefile (renamed from src/pkg/exp/template/Makefile)7
-rw-r--r--src/pkg/template/parse/lex.go (renamed from src/pkg/exp/template/parse/lex.go)0
-rw-r--r--src/pkg/template/parse/lex_test.go (renamed from src/pkg/exp/template/parse/lex_test.go)0
-rw-r--r--src/pkg/template/parse/node.go (renamed from src/pkg/exp/template/parse/node.go)0
-rw-r--r--src/pkg/template/parse/parse.go (renamed from src/pkg/exp/template/parse/parse.go)2
-rw-r--r--src/pkg/template/parse/parse_test.go (renamed from src/pkg/exp/template/parse/parse_test.go)0
-rw-r--r--src/pkg/template/parse/set.go (renamed from src/pkg/exp/template/parse/set.go)0
-rw-r--r--src/pkg/template/set.go (renamed from src/pkg/exp/template/set.go)2
-rw-r--r--src/pkg/template/set_test.go (renamed from src/pkg/exp/template/set_test.go)0
-rw-r--r--src/pkg/template/testdata/file1.tmpl (renamed from src/pkg/exp/template/testdata/file1.tmpl)0
-rw-r--r--src/pkg/template/testdata/file2.tmpl (renamed from src/pkg/exp/template/testdata/file2.tmpl)0
-rw-r--r--src/pkg/template/testdata/tmpl1.tmpl (renamed from src/pkg/exp/template/testdata/tmpl1.tmpl)0
-rw-r--r--src/pkg/template/testdata/tmpl2.tmpl (renamed from src/pkg/exp/template/testdata/tmpl2.tmpl)0
30 files changed, 25 insertions, 25 deletions
diff --git a/misc/goplay/goplay.go b/misc/goplay/goplay.go
index 4b59bbbe2..bbc388ba4 100644
--- a/misc/goplay/goplay.go
+++ b/misc/goplay/goplay.go
@@ -14,7 +14,7 @@ import (
"os"
"runtime"
"strconv"
- "exp/template"
+ "template"
)
var (
diff --git a/src/cmd/godoc/codewalk.go b/src/cmd/godoc/codewalk.go
index 2e14186b0..e2643e466 100644
--- a/src/cmd/godoc/codewalk.go
+++ b/src/cmd/godoc/codewalk.go
@@ -14,7 +14,6 @@ package main
import (
"container/vector"
- "exp/template"
"fmt"
"http"
"io"
@@ -24,6 +23,7 @@ import (
"sort"
"strconv"
"strings"
+ "template"
"utf8"
"xml"
)
diff --git a/src/cmd/godoc/format.go b/src/cmd/godoc/format.go
index 69fd6ba0c..78dde4166 100644
--- a/src/cmd/godoc/format.go
+++ b/src/cmd/godoc/format.go
@@ -11,13 +11,13 @@
package main
import (
- "exp/template"
"fmt"
"go/scanner"
"go/token"
"io"
"regexp"
"strconv"
+ "template"
)
// ----------------------------------------------------------------------------
diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 7d4bcdc0c..b8a839404 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -6,7 +6,6 @@ package main
import (
"bytes"
- "exp/template"
"flag"
"fmt"
"go/ast"
@@ -24,6 +23,7 @@ import (
"runtime"
"sort"
"strings"
+ "template"
"time"
)
diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index 25f79d60d..38a70ddfd 100644
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -8,11 +8,11 @@ package main
import (
"bytes"
- "exp/template"
"go/build"
"os"
"path/filepath"
"strings"
+ "template"
)
// domake builds the package in dir.
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 6fc4f9e46..ac36aaf0c 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -82,9 +82,7 @@ DIRS=\
exp/gui/x11\
exp/norm\
exp/regexp/syntax\
- exp/template\
exp/template/html\
- exp/template/parse\
expvar\
flag\
fmt\
@@ -157,6 +155,8 @@ DIRS=\
syscall\
syslog\
tabwriter\
+ template\
+ template/parse\
testing\
testing/iotest\
testing/quick\
diff --git a/src/pkg/exp/template/html/reverse.go b/src/pkg/exp/template/html/reverse.go
index 446e0f7b5..9a806c206 100644
--- a/src/pkg/exp/template/html/reverse.go
+++ b/src/pkg/exp/template/html/reverse.go
@@ -9,9 +9,9 @@
package html
import (
- "exp/template"
- "exp/template/parse"
"fmt"
+ "template"
+ "template/parse"
)
// Reverse reverses a template.
diff --git a/src/pkg/exp/template/html/reverse_test.go b/src/pkg/exp/template/html/reverse_test.go
index 32d11c6d6..bc29c07b7 100644
--- a/src/pkg/exp/template/html/reverse_test.go
+++ b/src/pkg/exp/template/html/reverse_test.go
@@ -6,7 +6,7 @@ package html
import (
"bytes"
- "exp/template"
+ "template"
"testing"
)
diff --git a/src/pkg/go/doc/comment.go b/src/pkg/go/doc/comment.go
index af307459e..e1989226b 100644
--- a/src/pkg/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
@@ -11,7 +11,7 @@ import (
"io"
"regexp"
"strings"
- "exp/template" // for HTMLEscape
+ "template" // for HTMLEscape
)
func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' }
diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go
index 80d206415..7e3e6f6e5 100644
--- a/src/pkg/rpc/debug.go
+++ b/src/pkg/rpc/debug.go
@@ -10,10 +10,10 @@ package rpc
*/
import (
- "exp/template"
"fmt"
"http"
"sort"
+ "template"
)
const debugText = `<html>
diff --git a/src/pkg/exp/template/parse/Makefile b/src/pkg/template/Makefile
index 5483a0cf9..3ed3b0330 100644
--- a/src/pkg/exp/template/parse/Makefile
+++ b/src/pkg/template/Makefile
@@ -2,13 +2,14 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include ../../../../Make.inc
+include ../../Make.inc
-TARG=exp/template/parse
+TARG=template
GOFILES=\
- lex.go\
- node.go\
+ exec.go\
+ funcs.go\
+ helper.go\
parse.go\
set.go\
-include ../../../../Make.pkg
+include ../../Make.pkg
diff --git a/src/pkg/exp/template/doc.go b/src/pkg/template/doc.go
index f65946aed..f65946aed 100644
--- a/src/pkg/exp/template/doc.go
+++ b/src/pkg/template/doc.go
diff --git a/src/pkg/exp/template/exec.go b/src/pkg/template/exec.go
index 08cb39090..eaa57ae81 100644
--- a/src/pkg/exp/template/exec.go
+++ b/src/pkg/template/exec.go
@@ -5,13 +5,13 @@
package template
import (
- "exp/template/parse"
"fmt"
"io"
"os"
"reflect"
"runtime"
"strings"
+ "template/parse"
)
// state represents the state of an execution. It's not part of the
diff --git a/src/pkg/exp/template/exec_test.go b/src/pkg/template/exec_test.go
index 82f56e13c..82f56e13c 100644
--- a/src/pkg/exp/template/exec_test.go
+++ b/src/pkg/template/exec_test.go
diff --git a/src/pkg/exp/template/funcs.go b/src/pkg/template/funcs.go
index feb1fd82c..feb1fd82c 100644
--- a/src/pkg/exp/template/funcs.go
+++ b/src/pkg/template/funcs.go
diff --git a/src/pkg/exp/template/helper.go b/src/pkg/template/helper.go
index c9b099856..c9b099856 100644
--- a/src/pkg/exp/template/helper.go
+++ b/src/pkg/template/helper.go
diff --git a/src/pkg/exp/template/parse.go b/src/pkg/template/parse.go
index 4b8a54e65..b089c599a 100644
--- a/src/pkg/exp/template/parse.go
+++ b/src/pkg/template/parse.go
@@ -5,9 +5,9 @@
package template
import (
- "exp/template/parse"
"os"
"reflect"
+ "template/parse"
)
// Template is the representation of a parsed template.
diff --git a/src/pkg/exp/template/Makefile b/src/pkg/template/parse/Makefile
index 06df9b659..fe6585809 100644
--- a/src/pkg/exp/template/Makefile
+++ b/src/pkg/template/parse/Makefile
@@ -4,11 +4,10 @@
include ../../../Make.inc
-TARG=exp/template
+TARG=template/parse
GOFILES=\
- exec.go\
- funcs.go\
- helper.go\
+ lex.go\
+ node.go\
parse.go\
set.go\
diff --git a/src/pkg/exp/template/parse/lex.go b/src/pkg/template/parse/lex.go
index 7ec4e920b..7ec4e920b 100644
--- a/src/pkg/exp/template/parse/lex.go
+++ b/src/pkg/template/parse/lex.go
diff --git a/src/pkg/exp/template/parse/lex_test.go b/src/pkg/template/parse/lex_test.go
index 2ad91d5fa..2ad91d5fa 100644
--- a/src/pkg/exp/template/parse/lex_test.go
+++ b/src/pkg/template/parse/lex_test.go
diff --git a/src/pkg/exp/template/parse/node.go b/src/pkg/template/parse/node.go
index a917418dc..a917418dc 100644
--- a/src/pkg/exp/template/parse/node.go
+++ b/src/pkg/template/parse/node.go
diff --git a/src/pkg/exp/template/parse/parse.go b/src/pkg/template/parse/parse.go
index 691d85ef6..9a411a3f3 100644
--- a/src/pkg/exp/template/parse/parse.go
+++ b/src/pkg/template/parse/parse.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// Package parse builds parse trees for templates. The grammar is defined
-// in the documents for the exp/template package.
+// in the documents for the template package.
package parse
import (
diff --git a/src/pkg/exp/template/parse/parse_test.go b/src/pkg/template/parse/parse_test.go
index 1928c319d..1928c319d 100644
--- a/src/pkg/exp/template/parse/parse_test.go
+++ b/src/pkg/template/parse/parse_test.go
diff --git a/src/pkg/exp/template/parse/set.go b/src/pkg/template/parse/set.go
index 4820da925..4820da925 100644
--- a/src/pkg/exp/template/parse/set.go
+++ b/src/pkg/template/parse/set.go
diff --git a/src/pkg/exp/template/set.go b/src/pkg/template/set.go
index 7f2813c04..f778fd169 100644
--- a/src/pkg/exp/template/set.go
+++ b/src/pkg/template/set.go
@@ -5,11 +5,11 @@
package template
import (
- "exp/template/parse"
"fmt"
"io"
"os"
"reflect"
+ "template/parse"
)
// Set holds a set of related templates that can refer to one another by name.
diff --git a/src/pkg/exp/template/set_test.go b/src/pkg/template/set_test.go
index f437bc779..f437bc779 100644
--- a/src/pkg/exp/template/set_test.go
+++ b/src/pkg/template/set_test.go
diff --git a/src/pkg/exp/template/testdata/file1.tmpl b/src/pkg/template/testdata/file1.tmpl
index febf9d9f8..febf9d9f8 100644
--- a/src/pkg/exp/template/testdata/file1.tmpl
+++ b/src/pkg/template/testdata/file1.tmpl
diff --git a/src/pkg/exp/template/testdata/file2.tmpl b/src/pkg/template/testdata/file2.tmpl
index 39bf6fb9e..39bf6fb9e 100644
--- a/src/pkg/exp/template/testdata/file2.tmpl
+++ b/src/pkg/template/testdata/file2.tmpl
diff --git a/src/pkg/exp/template/testdata/tmpl1.tmpl b/src/pkg/template/testdata/tmpl1.tmpl
index 3d15b8173..3d15b8173 100644
--- a/src/pkg/exp/template/testdata/tmpl1.tmpl
+++ b/src/pkg/template/testdata/tmpl1.tmpl
diff --git a/src/pkg/exp/template/testdata/tmpl2.tmpl b/src/pkg/template/testdata/tmpl2.tmpl
index a374d2fe7..a374d2fe7 100644
--- a/src/pkg/exp/template/testdata/tmpl2.tmpl
+++ b/src/pkg/template/testdata/tmpl2.tmpl
View Lorry Controller Status