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

allow trailing comma in braced initialized list

Browse Source 
R=ken
OCL=17141
CL=17143
This commit is contained in:
Russ Cox 2008-10-14 17:10:39 -07:00
parent 5933dbda3a
commit 82e41cc533
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cmd/gc/go.y
View File

@ -60,7 +60,7 @@
%type <node> interfacedcl_list_r interfacedcl
%type <node> structdcl_list_r structdcl
%type <node> fnres Afnres Bfnres fnliteral xfndcl fndcl fnbody
%type <node> keyexpr_list keyval_list_r keyval
%type <node> keyexpr_list braced_keyexpr_list keyval_list_r keyval
%type <type> typedclname new_type
%type <type> type Atype Btype
@ -871,7 +871,7 @@ pexpr:
$$ = nod(OCONV, $3, N);
$$->type = oldtype($1);
}
| convtype '{' keyexpr_list '}'
| convtype '{' braced_keyexpr_list '}'
{
// composite literal
$$ = rev($3);
@ -1598,7 +1598,32 @@ keyexpr_list:
{
$$ = rev($1);
}
| oexpr_list
| expr_list
/*
* have to spell this out using _r lists to avoid yacc conflict
*/
braced_keyexpr_list:
{
$$ = N;
}
| keyval_list_r
{
$$ = rev($1);
}
| keyval_list_r ','
{
$$ = rev($1);
}
| expr_list_r
{
$$ = rev($1);
}
| expr_list_r ','
{
$$ = rev($1);
}
/*
* the one compromise of a

17
test/initcomma.go Normal file
View File

@ -0,0 +1,17 @@
// $G $F.go && $L $F.$A && ./$A.out
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
var a = []int { 1, 2, }
var b = [5]int { }
var c = []int { 1 }
func main() {
if len(a) != 2 { panicln("len a", len(a)) }
if len(b) != 5 { panicln("len b", len(b)) }
if len(c) != 1 { panicln("len a", len(a)) }
}