Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

change datafmt syntax to use '@' instead of '^' (to match

Browse source 
convention used in template.go)

R=rsc
DELTA=22  (3 added, 1 deleted, 18 changed)
OCL=29780
CL=29782
This commit is contained in:
Robert Griesemer 2009-06-02 18:03:47 -07:00
parent 43456b4a7a
commit aa9ce6148a
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/datafmt/parser.go
View file

@ -86,7 +86,7 @@ func (p *parser) next() {
func (p *parser) init(src []byte) {
p.errors.Init(0);
p.scanner.Init(src, p, 0);
p.scanner.Init(src, p, scanner.AllowIllegalChars); // return '@' as token.ILLEGAL w/o error message
p.next(); // initializes pos, tok, lit
p.packs = make(map [string] string);
p.rules = make(map [string] expr);
@ -231,8 +231,11 @@ func (p *parser) parseLiteral() literal {
func (p *parser) parseField() expr {
var fname string;
switch p.tok {
case token.XOR:
fname = "^";
case token.ILLEGAL:
if string(p.lit) != "@" {
return nil;
}
fname = "@";
p.next();
case token.MUL:
fname = "*";