summaryrefslogtreecommitdiff
path: root/src/lib/go/parser.go
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2009-04-02 15:58:38 -0700
committerRobert Griesemer <gri@golang.org>2009-04-02 15:58:38 -0700
commit63fe0852470628233b332923ca23a261c6ca3bc9 (patch)
tree09be04c2acd6b4e538e6e55298fe39d6db3e7a8b /src/lib/go/parser.go
parente39f057d239cfeacdfe07b8c21aa293ecef623fe (diff)
downloadgolang-63fe0852470628233b332923ca23a261c6ca3bc9.tar.gz
- Ident node now takes a string Value instead of a []bytes
(this removes a lot of string() conversions down the road) - a few minor adjustments R=rsc DELTA=11 (0 added, 0 deleted, 11 changed) OCL=27029 CL=27038
Diffstat (limited to 'src/lib/go/parser.go')
-rw-r--r--src/lib/go/parser.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/go/parser.go b/src/lib/go/parser.go
index 39aeb5c15..038b27266 100644
--- a/src/lib/go/parser.go
+++ b/src/lib/go/parser.go
@@ -229,12 +229,12 @@ func (p *parser) parseDeclaration() ast.Decl;
func (p *parser) parseIdent() *ast.Ident {
if p.tok == token.IDENT {
- x := &ast.Ident{p.pos, p.lit};
+ x := &ast.Ident{p.pos, string(p.lit)};
p.next();
return x;
}
p.expect(token.IDENT); // use expect() error handling
- return &ast.Ident{p.pos, [0]byte{}};
+ return &ast.Ident{p.pos, ""};
}
@@ -360,7 +360,7 @@ func (p *parser) makeIdentList(list *vector.Vector) []*ast.Ident {
if !is_ident {
pos := list.At(i).(ast.Expr).Pos();
p.error_expected(pos, "identifier");
- idents[i] = &ast.Ident{pos, []byte{}};
+ idents[i] = &ast.Ident{pos, ""};
}
idents[i] = ident;
}
@@ -907,7 +907,7 @@ func (p *parser) parseSelectorOrTypeAssertion(x ast.Expr) ast.Expr {
var typ ast.Expr;
if p.tok == token.TYPE {
// special case for type switch
- typ = &ast.Ident{p.pos, p.lit};
+ typ = &ast.Ident{p.pos, "type"};
p.next();
} else {
typ = p.parseType();
@@ -1654,7 +1654,7 @@ func parseImportSpec(p *parser, doc ast.Comments) ast.Spec {
var ident *ast.Ident;
if p.tok == token.PERIOD {
- ident = &ast.Ident{p.pos, []byte{'.'}};
+ ident = &ast.Ident{p.pos, "."};
p.next();
} else if p.tok == token.IDENT {
ident = p.parseIdent();