mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optional semi-colons 

SVN=123245
This commit is contained in:
Ken Thompson 2008-06-17 17:57:31 -07:00
parent 9615542d10
commit 0006c83231
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
%type <node> else_stmt1 else_stmt2 %type <node> else_stmt1 else_stmt2
%type <node> complex_stmt compound_stmt ostmt_list %type <node> complex_stmt compound_stmt ostmt_list
%type <node> stmt_list_r Astmt_list_r Bstmt_list_r %type <node> stmt_list_r Astmt_list_r Bstmt_list_r
%type <node> Astmt Bstmt Cstmt %type <node> Astmt Bstmt Cstmt Dstmt
%type <node> for_stmt for_body for_header %type <node> for_stmt for_body for_header
%type <node> if_stmt if_body if_header %type <node> if_stmt if_body if_header
%type <node> range_header range_body range_stmt %type <node> range_header range_body range_stmt
@ -314,10 +314,6 @@ complex_stmt:
poptodcl(); poptodcl();
$$ = nod(OXCASE, N, N); $$ = nod(OXCASE, N, N);
} }
| new_name ':'
{
$$ = nod(OLABEL, $1, N);
}
semi_stmt: semi_stmt:
LFALL LFALL
@ -1101,26 +1097,40 @@ Cstmt:
simple_stmt simple_stmt
/* /*
* statement list that need semi in back NO * need semi in front YES
* need semi in back NO
*/
Dstmt:
new_name ':'
{
$$ = nod(OLABEL, $1, N);
}
/*
* statement list that ends AorD
*/ */
Astmt_list_r: Astmt_list_r:
Astmt Astmt
| Dstmt
| Astmt_list_r Astmt | Astmt_list_r Astmt
{ {
$$ = nod(OLIST, $1, $2); $$ = nod(OLIST, $1, $2);
} }
| Bstmt_list_r ';' | Astmt_list_r Dstmt
{
$$ = nod(OLIST, $1, $2);
}
| Bstmt_list_r Astmt
{
$$ = nod(OLIST, $1, $2);
}
/* /*
* statement list that need semi in back YES * statement list that ends BorC
*/ */
Bstmt_list_r: Bstmt_list_r:
Bstmt Bstmt
| Cstmt | Cstmt
| Bstmt_list_r Bstmt
{
$$ = nod(OLIST, $1, $2);
}
| Astmt_list_r Bstmt | Astmt_list_r Bstmt
{ {
$$ = nod(OLIST, $1, $2); $$ = nod(OLIST, $1, $2);
@ -1129,6 +1139,10 @@ Bstmt_list_r:
{ {
$$ = nod(OLIST, $1, $2); $$ = nod(OLIST, $1, $2);
} }
| Bstmt_list_r Bstmt
{
$$ = nod(OLIST, $1, $2);
}
stmt_list_r: stmt_list_r:
Astmt_list_r Astmt_list_r