qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 07:57:56 -07:00
Code Releases Activity

template: move exp/template into template.

Browse Source 
(Leave exp/template/html where it is for now.)

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/4899048
This commit is contained in:
Rob Pike 2011-08-17 14:55:57 +10:00
parent 73b7afbebd
commit a22e77e6ae
30 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/goplay/goplay.go
View File

@ -14,7 +14,7 @@ import (
"os" "os"
"runtime" "runtime"
"strconv" "strconv"
"exp/template" "template"
) )
var ( var (

2
src/cmd/godoc/codewalk.go
View File

@ -14,7 +14,6 @@ package main
import ( import (
"container/vector" "container/vector"
"exp/template"
"fmt" "fmt"
"http" "http"
"io" "io"
@ -24,6 +23,7 @@ import (
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
"template"
"utf8" "utf8"
"xml" "xml"
) )

2
src/cmd/godoc/format.go
View File

@ -11,13 +11,13 @@
package main package main
import ( import (
"exp/template"
"fmt" "fmt"
"go/scanner" "go/scanner"
"go/token" "go/token"
"io" "io"
"regexp" "regexp"
"strconv" "strconv"
"template"
) )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/cmd/godoc/godoc.go
View File

@ -6,7 +6,6 @@ package main
import ( import (
"bytes" "bytes"
"exp/template"
"flag" "flag"
"fmt" "fmt"
"go/ast" "go/ast"
@ -24,6 +23,7 @@ import (
"runtime" "runtime"
"sort" "sort"
"strings" "strings"
"template"
"time" "time"
) )

2
src/cmd/goinstall/make.go
View File

@ -8,11 +8,11 @@ package main
import ( import (
"bytes" "bytes"
"exp/template"
"go/build" "go/build"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"template"
) )
// domake builds the package in dir. // domake builds the package in dir.

4
src/pkg/Makefile
View File

@ -82,9 +82,7 @@ DIRS=\
exp/gui/x11\ exp/gui/x11\
exp/norm\ exp/norm\
exp/regexp/syntax\ exp/regexp/syntax\
exp/template\
exp/template/html\ exp/template/html\
exp/template/parse\
expvar\ expvar\
flag\ flag\
fmt\ fmt\
@ -157,6 +155,8 @@ DIRS=\
syscall\ syscall\
syslog\ syslog\
tabwriter\ tabwriter\
template\
template/parse\
testing\ testing\
testing/iotest\ testing/iotest\
testing/quick\ testing/quick\

4
src/pkg/exp/template/html/reverse.go
View File

@ -9,9 +9,9 @@
package html package html
import ( import (
"exp/template"
"exp/template/parse"
"fmt" "fmt"
"template"
"template/parse"
) )
// Reverse reverses a template. // Reverse reverses a template.

2
src/pkg/exp/template/html/reverse_test.go
View File

@ -6,7 +6,7 @@ package html
import ( import (
"bytes" "bytes"
"exp/template" "template"
"testing" "testing"
) )

2
src/pkg/go/doc/comment.go
View File

@ -11,7 +11,7 @@ import (
"io" "io"
"regexp" "regexp"
"strings" "strings"
"exp/template" // for HTMLEscape "template" // for HTMLEscape
) )
func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' } func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' }

2
src/pkg/rpc/debug.go
View File

@ -10,10 +10,10 @@ package rpc
*/ */
import ( import (
"exp/template"
"fmt" "fmt"
"http" "http"
"sort" "sort"
"template"
) )
const debugText = `<html> const debugText = `<html>

11
src/pkg/exp/template/parse/Makefile → src/pkg/template/Makefile
View File

@ -2,13 +2,14 @@
# Use of this source code is governed by a BSD-style # Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file. # license that can be found in the LICENSE file.
include ../../../../Make.inc include ../../Make.inc
TARG=exp/template/parse TARG=template
GOFILES=\ GOFILES=\
lex.go\ exec.go\
node.go\ funcs.go\
helper.go\
parse.go\ parse.go\
set.go\ set.go\
include ../../../../Make.pkg include ../../Make.pkg

0
src/pkg/exp/template/doc.go → src/pkg/template/doc.go
View File

2
src/pkg/exp/template/exec.go → src/pkg/template/exec.go
View File

@ -5,13 +5,13 @@
package template package template
import ( import (
"exp/template/parse"
"fmt" "fmt"
"io" "io"
"os" "os"
"reflect" "reflect"
"runtime" "runtime"
"strings" "strings"
"template/parse"
) )
// state represents the state of an execution. It's not part of the // state represents the state of an execution. It's not part of the

0
src/pkg/exp/template/exec_test.go → src/pkg/template/exec_test.go
View File

0
src/pkg/exp/template/funcs.go → src/pkg/template/funcs.go
View File

0
src/pkg/exp/template/helper.go → src/pkg/template/helper.go
View File

2
src/pkg/exp/template/parse.go → src/pkg/template/parse.go
View File

@ -5,9 +5,9 @@
package template package template
import ( import (
"exp/template/parse"
"os" "os"
"reflect" "reflect"
"template/parse"
) )
// Template is the representation of a parsed template. // Template is the representation of a parsed template.

7
src/pkg/exp/template/Makefile → src/pkg/template/parse/Makefile
View File

@ -4,11 +4,10 @@
include ../../../Make.inc include ../../../Make.inc
TARG=exp/template TARG=template/parse
GOFILES=\ GOFILES=\
exec.go\ lex.go\
funcs.go\ node.go\
helper.go\
parse.go\ parse.go\
set.go\ set.go\

0
src/pkg/exp/template/parse/lex.go → src/pkg/template/parse/lex.go
View File

0
src/pkg/exp/template/parse/lex_test.go → src/pkg/template/parse/lex_test.go
View File

0
src/pkg/exp/template/parse/node.go → src/pkg/template/parse/node.go
View File

2
src/pkg/exp/template/parse/parse.go → src/pkg/template/parse/parse.go
View File

@ -3,7 +3,7 @@
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// Package parse builds parse trees for templates. The grammar is defined // 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 package parse
import ( import (

0
src/pkg/exp/template/parse/parse_test.go → src/pkg/template/parse/parse_test.go
View File

0
src/pkg/exp/template/parse/set.go → src/pkg/template/parse/set.go
View File

2
src/pkg/exp/template/set.go → src/pkg/template/set.go
View File

@ -5,11 +5,11 @@
package template package template
import ( import (
"exp/template/parse"
"fmt" "fmt"
"io" "io"
"os" "os"
"reflect" "reflect"
"template/parse"
) )
// Set holds a set of related templates that can refer to one another by name. // Set holds a set of related templates that can refer to one another by name.

0
src/pkg/exp/template/set_test.go → src/pkg/template/set_test.go
View File

0
src/pkg/exp/template/testdata/file1.tmpl → src/pkg/template/testdata/file1.tmpl vendored
View File

0
src/pkg/exp/template/testdata/file2.tmpl → src/pkg/template/testdata/file2.tmpl vendored
View File

0
src/pkg/exp/template/testdata/tmpl1.tmpl → src/pkg/template/testdata/tmpl1.tmpl vendored
View File

0
src/pkg/exp/template/testdata/tmpl2.tmpl → src/pkg/template/testdata/tmpl2.tmpl vendored
View File