template: move exp/template into template.

(Leave exp/template/html where it is for now.) R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/4899048
2024-11-24 21:10:04 -07:00 · 2011-08-17 14:55:57 +10:00 · 2011-08-17 14:55:57 +10:00 · a22e77e6ae
commit a22e77e6ae
parent 73b7afbebd
30 changed files with 25 additions and 25 deletions
--- a/misc/goplay/goplay.go
+++ b/misc/goplay/goplay.go
@ -14,7 +14,7 @@ import (
 	"os"
 	"runtime"
 	"strconv"
-	"exp/template"
+	"template"
 )

 var (
--- 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"
 )
--- 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"
 )

 // ----------------------------------------------------------------------------
--- 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"
 )

--- 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.
--- 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\
--- 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.
--- 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"
 )

--- 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' }
--- 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>
--- a/src/pkg/exp/template/parse/Makefile
+++ b/src/pkg/exp/template/parse/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
--- a/src/pkg/exp/template/doc.go
+++ b/src/pkg/exp/template/doc.go
--- a/src/pkg/exp/template/exec.go
+++ b/src/pkg/exp/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
--- a/src/pkg/exp/template/exec_test.go
+++ b/src/pkg/exp/template/exec_test.go
--- a/src/pkg/exp/template/funcs.go
+++ b/src/pkg/exp/template/funcs.go
--- a/src/pkg/exp/template/helper.go
+++ b/src/pkg/exp/template/helper.go
--- a/src/pkg/exp/template/parse.go
+++ b/src/pkg/exp/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.
--- a/src/pkg/template/parse/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\

--- a/src/pkg/exp/template/parse/lex.go
+++ b/src/pkg/exp/template/parse/lex.go
--- a/src/pkg/exp/template/parse/lex_test.go
+++ b/src/pkg/exp/template/parse/lex_test.go
--- a/src/pkg/exp/template/parse/node.go
+++ b/src/pkg/exp/template/parse/node.go
--- a/src/pkg/exp/template/parse/parse.go
+++ b/src/pkg/exp/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 (
--- a/src/pkg/exp/template/parse/parse_test.go
+++ b/src/pkg/exp/template/parse/parse_test.go
--- a/src/pkg/exp/template/parse/set.go
+++ b/src/pkg/exp/template/parse/set.go
--- a/src/pkg/exp/template/set.go
+++ b/src/pkg/exp/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.
--- a/src/pkg/exp/template/set_test.go
+++ b/src/pkg/exp/template/set_test.go
--- a/src/pkg/exp/template/testdata/file1.tmpl
+++ b/src/pkg/exp/template/testdata/file1.tmpl
--- a/src/pkg/exp/template/testdata/file2.tmpl
+++ b/src/pkg/exp/template/testdata/file2.tmpl
--- a/src/pkg/exp/template/testdata/tmpl1.tmpl
+++ b/src/pkg/exp/template/testdata/tmpl1.tmpl
--- a/src/pkg/exp/template/testdata/tmpl2.tmpl
+++ b/src/pkg/exp/template/testdata/tmpl2.tmpl