Skip to content

G
golang
Commit 2ce57ec1 authored by Robert Griesemer's avatar Robert Griesemer
Browse files
Options

gofmt-ify src/pkg/go (excluding printer directory due to pending CL, 

and parser.go and scanner_test.go which have minor formatting issues)

R=rsc
http://go/go-review/1016042
parent 26c3f6c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 168 deletions
src/pkg/go/ast/ast.go
View file @ 2ce57ec1
This diff is collapsed.
src/pkg/go/ast/scope.go
View file @ 2ce57ec1
...@@ -11,8 +11,8 @@ package ast ...@@ -11,8 +11,8 @@ package ast
// NOTE: WORK IN PROGRESS // NOTE: WORK IN PROGRESS
// //
type Scope struct { type Scope struct {
Outer *Scope; Outer *Scope;
Names map[string]*Ident Names map[string]*Ident;
} }
...@@ -38,7 +38,7 @@ func (s *Scope) Declare(ident *Ident) bool { ...@@ -38,7 +38,7 @@ func (s *Scope) Declare(ident *Ident) bool {
// Lookup looks up an identifier in the current scope chain. // Lookup looks up an identifier in the current scope chain.
// If the identifier is found, it is returned; otherwise the // If the identifier is found, it is returned; otherwise the
// result is nil. // result is nil.
// //
func (s *Scope) Lookup(name string) *Ident { func (s *Scope) Lookup(name string) *Ident {
for ; s != nil; s = s.Outer { for ; s != nil; s = s.Outer {
if ident, found := s.Names[name]; found { if ident, found := s.Names[name]; found {
...@@ -91,4 +91,4 @@ var Universe = Scope { ...@@ -91,4 +91,4 @@ var Universe = Scope {
"println": nil, "println": nil,
} }
} }
*/ */
\ No newline at end of file
src/pkg/go/doc/comment.go
View file @ 2ce57ec1
...@@ -31,8 +31,8 @@ func CommentText(comment *ast.CommentGroup) string { ...@@ -31,8 +31,8 @@ func CommentText(comment *ast.CommentGroup) string {
// Remove comment markers. // Remove comment markers.
// The parser has given us exactly the comment text. // The parser has given us exactly the comment text.
switch n := len(c); { switch n := len(c); {
case n >= 4 && c[0:2] == "/*" && c[n-2:n] == "*/": case n >= 4 && c[0:2] == "/*" && c[n-2 : n] == "*/":
c = c[2:n-2]; c = c[2 : n-2];
case n >= 2 && c[0:2] == "//": case n >= 2 && c[0:2] == "//":
c = c[2:n]; c = c[2:n];
// Remove leading space after //, if there is one. // Remove leading space after //, if there is one.
...@@ -51,7 +51,7 @@ func CommentText(comment *ast.CommentGroup) string { ...@@ -51,7 +51,7 @@ func CommentText(comment *ast.CommentGroup) string {
for m > 0 && (l[m-1] == ' ' || l[m-1] == '\n' || l[m-1] == '\t' || l[m-1] == '\r') { for m > 0 && (l[m-1] == ' ' || l[m-1] == '\n' || l[m-1] == '\t' || l[m-1] == '\r') {
m--; m--;
} }
l = l[0 : m]; l = l[0:m];
// Add to list. // Add to list.
n := len(lines); n := len(lines);
...@@ -76,7 +76,7 @@ func CommentText(comment *ast.CommentGroup) string { ...@@ -76,7 +76,7 @@ func CommentText(comment *ast.CommentGroup) string {
n++; n++;
} }
} }
lines = lines[0 : n]; lines = lines[0:n];
// Add final "" entry to get trailing newline from Join. // Add final "" entry to get trailing newline from Join.
// The original loop always leaves room for one more. // The original loop always leaves room for one more.
...@@ -115,7 +115,7 @@ func split(text []byte) [][]byte { ...@@ -115,7 +115,7 @@ func split(text []byte) [][]byte {
} }
} }
if last < len(text) { if last < len(text) {
out[n] = text[last : len(text)]; out[n] = text[last:len(text)];
} }
return out; return out;
...@@ -123,8 +123,8 @@ func split(text []byte) [][]byte { ...@@ -123,8 +123,8 @@ func split(text []byte) [][]byte {
var ( var (
ldquo = strings.Bytes("&ldquo;"); ldquo = strings.Bytes("&ldquo;");
rdquo = strings.Bytes("&rdquo;"); rdquo = strings.Bytes("&rdquo;");
) )
// Escape comment text for HTML. // Escape comment text for HTML.
...@@ -133,7 +133,7 @@ func commentEscape(w io.Writer, s []byte) { ...@@ -133,7 +133,7 @@ func commentEscape(w io.Writer, s []byte) {
last := 0; last := 0;
for i := 0; i < len(s)-1; i++ { for i := 0; i < len(s)-1; i++ {
if s[i] == s[i+1] && (s[i] == '`' || s[i] == '\'') { if s[i] == s[i+1] && (s[i] == '`' || s[i] == '\'') {
template.HtmlEscape(w, s[last : i]); template.HtmlEscape(w, s[last:i]);
last = i+2; last = i+2;
switch s[i] { switch s[i] {
case '`': case '`':
...@@ -144,15 +144,15 @@ func commentEscape(w io.Writer, s []byte) { ...@@ -144,15 +144,15 @@ func commentEscape(w io.Writer, s []byte) {
i++; // loop will add one more i++; // loop will add one more
} }
} }
template.HtmlEscape(w, s[last : len(s)]); template.HtmlEscape(w, s[last:len(s)]);
} }
var ( var (
html_p = strings.Bytes("<p>\n"); html_p = strings.Bytes("<p>\n");
html_endp = strings.Bytes("</p>\n"); html_endp = strings.Bytes("</p>\n");
html_pre = strings.Bytes("<pre>"); html_pre = strings.Bytes("<pre>");
html_endpre = strings.Bytes("</pre>\n"); html_endpre = strings.Bytes("</pre>\n");
) )
...@@ -166,7 +166,7 @@ func indentLen(s []byte) int { ...@@ -166,7 +166,7 @@ func indentLen(s []byte) int {
func isBlank(s []byte) bool { func isBlank(s []byte) bool {
return len(s) == 0 || (len(s) == 1 && s[0] == '\n') return len(s) == 0 || (len(s) == 1 && s[0] == '\n');
} }
...@@ -175,7 +175,7 @@ func commonPrefix(a, b []byte) []byte { ...@@ -175,7 +175,7 @@ func commonPrefix(a, b []byte) []byte {
for i < len(a) && i < len(b) && a[i] == b[i] { for i < len(a) && i < len(b) && a[i] == b[i] {
i++; i++;
} }
return a[0 : i]; return a[0:i];
} }
...@@ -196,7 +196,7 @@ func unindent(block [][]byte) { ...@@ -196,7 +196,7 @@ func unindent(block [][]byte) {
// remove // remove
for i, line := range block { for i, line := range block {
if !isBlank(line) { if !isBlank(line) {
block[i] = line[n : len(line)]; block[i] = line[n:len(line)];
} }
} }
} }
...@@ -233,7 +233,7 @@ func ToHtml(w io.Writer, s []byte) { ...@@ -233,7 +233,7 @@ func ToHtml(w io.Writer, s []byte) {
lines := split(s); lines := split(s);
unindent(lines); unindent(lines);
for i := 0; i < len(lines); { for i := 0; i < len(lines); {
line := lines[i]; line := lines[i];
if isBlank(line) { if isBlank(line) {
// close paragraph // close paragraph
...@@ -260,7 +260,7 @@ func ToHtml(w io.Writer, s []byte) { ...@@ -260,7 +260,7 @@ func ToHtml(w io.Writer, s []byte) {
for j > i && isBlank(lines[j-1]) { for j > i && isBlank(lines[j-1]) {
j--; j--;
} }
block := lines[i : j]; block := lines[i:j];
i = j; i = j;
unindent(block); unindent(block);
...@@ -288,4 +288,3 @@ func ToHtml(w io.Writer, s []byte) { ...@@ -288,4 +288,3 @@ func ToHtml(w io.Writer, s []byte) {
inpara = false; inpara = false;
} }
} }
src/pkg/go/doc/doc.go
View file @ 2ce57ec1
...@@ -245,8 +245,8 @@ func copyCommentList(list []*ast.Comment) []*ast.Comment { ...@@ -245,8 +245,8 @@ func copyCommentList(list []*ast.Comment) []*ast.Comment {
var ( var (
bug_markers = regexp.MustCompile("^/[/*][ \t]*BUG\\(.*\\):[ \t]*"); // BUG(uid): bug_markers = regexp.MustCompile("^/[/*][ \t]*BUG\\(.*\\):[ \t]*"); // BUG(uid):
bug_content = regexp.MustCompile("[^ \n\r\t]+"); // at least one non-whitespace char bug_content = regexp.MustCompile("[^ \n\r\t]+"); // at least one non-whitespace char
) )
......
src/pkg/go/parser/interface.go
View file @ 2ce57ec1
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
package parser package parser
import ( import (
"bytes"; "bytes";
"fmt"; "fmt";
"go/ast"; "go/ast";
"go/scanner"; "go/scanner";
"io"; "io";
"os"; "os";
pathutil "path"; pathutil "path";
"strings"; "strings";
) )
......
src/pkg/go/scanner/scanner.go
View file @ 2ce57ec1
...@@ -250,7 +250,7 @@ func (S *Scanner) scanNumber(seen_decimal_point bool) token.Token { ...@@ -250,7 +250,7 @@ func (S *Scanner) scanNumber(seen_decimal_point bool) token.Token {
tok = token.FLOAT; tok = token.FLOAT;
goto mantissa; goto mantissa;
} }
// octal int // octal int
} }
goto exit; goto exit;
} }
...@@ -554,7 +554,7 @@ func Tokenize(filename string, src []byte, err ErrorHandler, mode uint, f func(p ...@@ -554,7 +554,7 @@ func Tokenize(filename string, src []byte, err ErrorHandler, mode uint, f func(p
var s Scanner; var s Scanner;
s.Init(filename, src, err, mode); s.Init(filename, src, err, mode);
for f(s.Scan()) { for f(s.Scan()) {
// action happens in f // action happens in f
} }
return s.ErrorCount; return s.ErrorCount;
} }
src/pkg/go/token/token.go
View file @ 2ce57ec1
...@@ -20,27 +20,27 @@ type Token int ...@@ -20,27 +20,27 @@ type Token int
// The list of tokens. // The list of tokens.
const ( const (
// Special tokens // Special tokens
ILLEGAL Token = iota; ILLEGAL Token = iota;
EOF; EOF;
COMMENT; COMMENT;
literal_beg; literal_beg;
// Identifiers and basic type literals // Identifiers and basic type literals
// (these tokens stand for classes of literals) // (these tokens stand for classes of literals)
IDENT; // main IDENT; // main
INT; // 12345 INT; // 12345
FLOAT; // 123.45 FLOAT; // 123.45
CHAR; // 'a' CHAR; // 'a'
STRING; // "abc" STRING; // "abc"
literal_end; literal_end;
operator_beg; operator_beg;
// Operators and delimiters // Operators and delimiters
ADD; // + ADD; // +
SUB; // - SUB; // -
MUL; // * MUL; // *
QUO; // / QUO; // /
REM; // % REM; // %
AND; // & AND; // &
OR; // | OR; // |
...@@ -62,17 +62,17 @@ const ( ...@@ -62,17 +62,17 @@ const (
SHR_ASSIGN; // >>= SHR_ASSIGN; // >>=
AND_NOT_ASSIGN; // &^= AND_NOT_ASSIGN; // &^=
LAND; // && LAND; // &&
LOR; // || LOR; // ||
ARROW; // <- ARROW; // <-
INC; // ++ INC; // ++
DEC; // -- DEC; // --
EQL; // == EQL; // ==
LSS; // < LSS; // <
GTR; // > GTR; // >
ASSIGN; // = ASSIGN; // =
NOT; // ! NOT; // !
NEQ; // != NEQ; // !=
LEQ; // <= LEQ; // <=
...@@ -80,11 +80,11 @@ const ( ...@@ -80,11 +80,11 @@ const (
DEFINE; // := DEFINE; // :=
ELLIPSIS; // ... ELLIPSIS; // ...
LPAREN; // ( LPAREN; // (
LBRACK; // [ LBRACK; // [
LBRACE; // { LBRACE; // {
COMMA; // , COMMA; // ,
PERIOD; // . PERIOD; // .
RPAREN; // ) RPAREN; // )
RBRACK; // ] RBRACK; // ]
...@@ -131,103 +131,103 @@ const ( ...@@ -131,103 +131,103 @@ const (
// At the moment we have no array literal syntax that lets us describe // At the moment we have no array literal syntax that lets us describe
// the index for each element - use a map for now to make sure they are // the index for each element - use a map for now to make sure they are
// in sync. // in sync.
var tokens = map [Token] string { var tokens = map[Token]string{
ILLEGAL : "ILLEGAL", ILLEGAL: "ILLEGAL",
EOF : "EOF", EOF: "EOF",
COMMENT : "COMMENT", COMMENT: "COMMENT",
IDENT : "IDENT", IDENT: "IDENT",
INT : "INT", INT: "INT",
FLOAT : "FLOAT", FLOAT: "FLOAT",
CHAR : "CHAR", CHAR: "CHAR",
STRING : "STRING", STRING: "STRING",
ADD : "+", ADD: "+",
SUB : "-", SUB: "-",
MUL : "*", MUL: "*",
QUO : "/", QUO: "/",
REM : "%", REM: "%",
AND : "&", AND: "&",
OR : "|", OR: "|",
XOR : "^", XOR: "^",
SHL : "<<", SHL: "<<",
SHR : ">>", SHR: ">>",
AND_NOT : "&^", AND_NOT: "&^",
ADD_ASSIGN : "+=", ADD_ASSIGN: "+=",
SUB_ASSIGN : "-=", SUB_ASSIGN: "-=",
MUL_ASSIGN : "*=", MUL_ASSIGN: "*=",
QUO_ASSIGN : "/=", QUO_ASSIGN: "/=",
REM_ASSIGN : "%=", REM_ASSIGN: "%=",
AND_ASSIGN : "&=", AND_ASSIGN: "&=",
OR_ASSIGN : "|=", OR_ASSIGN: "|=",
XOR_ASSIGN : "^=", XOR_ASSIGN: "^=",
SHL_ASSIGN : "<<=", SHL_ASSIGN: "<<=",
SHR_ASSIGN : ">>=", SHR_ASSIGN: ">>=",
AND_NOT_ASSIGN : "&^=", AND_NOT_ASSIGN: "&^=",
LAND : "&&", LAND: "&&",
LOR : "||", LOR: "||",
ARROW : "<-", ARROW: "<-",
INC : "++", INC: "++",
DEC : "--", DEC: "--",
EQL : "==", EQL: "==",
LSS : "<", LSS: "<",
GTR : ">", GTR: ">",
ASSIGN : "=", ASSIGN: "=",
NOT : "!", NOT: "!",
NEQ : "!=", NEQ: "!=",
LEQ : "<=", LEQ: "<=",
GEQ : ">=", GEQ: ">=",
DEFINE : ":=", DEFINE: ":=",
ELLIPSIS : "...", ELLIPSIS: "...",
LPAREN : "(", LPAREN: "(",
LBRACK : "[", LBRACK: "[",
LBRACE : "{", LBRACE: "{",
COMMA : ",", COMMA: ",",
PERIOD : ".", PERIOD: ".",
RPAREN : ")", RPAREN: ")",
RBRACK : "]", RBRACK: "]",
RBRACE : "}", RBRACE: "}",
SEMICOLON : ";", SEMICOLON: ";",
COLON : ":", COLON: ":",
BREAK : "break", BREAK: "break",
CASE : "case", CASE: "case",
CHAN : "chan", CHAN: "chan",
CONST : "const", CONST: "const",
CONTINUE : "continue", CONTINUE: "continue",
DEFAULT : "default", DEFAULT: "default",
DEFER : "defer", DEFER: "defer",
ELSE : "else", ELSE: "else",
FALLTHROUGH : "fallthrough", FALLTHROUGH: "fallthrough",
FOR : "for", FOR: "for",
FUNC : "func", FUNC: "func",
GO : "go", GO: "go",
GOTO : "goto", GOTO: "goto",
IF : "if", IF: "if",
IMPORT : "import", IMPORT: "import",
INTERFACE : "interface", INTERFACE: "interface",
MAP : "map", MAP: "map",
PACKAGE : "package", PACKAGE: "package",
RANGE : "range", RANGE: "range",
RETURN : "return", RETURN: "return",
SELECT : "select", SELECT: "select",
STRUCT : "struct", STRUCT: "struct",
SWITCH : "switch", SWITCH: "switch",
TYPE : "type", TYPE: "type",
VAR : "var", VAR: "var",
} }
...@@ -252,9 +252,9 @@ func (tok Token) String() string { ...@@ -252,9 +252,9 @@ func (tok Token) String() string {
// selector, indexing, and other operator and delimiter tokens. // selector, indexing, and other operator and delimiter tokens.
// //
const ( const (
LowestPrec = 0; // non-operators LowestPrec = 0; // non-operators
UnaryPrec = 7; UnaryPrec = 7;
HighestPrec = 8; HighestPrec = 8;
) )
...@@ -281,10 +281,10 @@ func (op Token) Precedence() int { ...@@ -281,10 +281,10 @@ func (op Token) Precedence() int {
} }
var keywords map [string] Token; var keywords map[string]Token
func init() { func init() {
keywords = make(map [string] Token); keywords = make(map[string]Token);
for i := keyword_beg + 1; i < keyword_end; i++ { for i := keyword_beg + 1; i < keyword_end; i++ {
keywords[tokens[i]] = i; keywords[tokens[i]] = i;
} }
...@@ -331,10 +331,10 @@ func (tok Token) IsKeyword() bool { ...@@ -331,10 +331,10 @@ func (tok Token) IsKeyword() bool {
// A Position is valid if the line number is > 0. // A Position is valid if the line number is > 0.
// //
type Position struct { type Position struct {
Filename string; // filename, if any Filename string; // filename, if any
Offset int; // byte offset, starting at 0 Offset int; // byte offset, starting at 0
Line int; // line number, starting at 1 Line int; // line number, starting at 1
Column int; // column number, starting at 1 (character count) Column int; // column number, starting at 1 (character count)
} }
...@@ -348,7 +348,7 @@ func (pos *Position) Pos() Position { ...@@ -348,7 +348,7 @@ func (pos *Position) Pos() Position {
// IsValid returns true if the position is valid. // IsValid returns true if the position is valid.
func (pos *Position) IsValid() bool { func (pos *Position) IsValid() bool {
return pos.Line > 0 return pos.Line > 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment