mirrors
/
lua
mirror of https://github.com/lua/lua
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new syntax for constructors (a={n=3;1,2,3}).

This commit is contained in:
Roberto Ierusalimschy 1997-12-22 15:24:11 -02:00
parent 7ecc3ce827
commit 22439a7511
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lua.stx
View File

@ -1,6 +1,6 @@
%{ %{
/* /*
** $Id: lua.stx,v 1.22 1997/12/09 16:01:08 roberto Exp roberto $ ** $Id: lua.stx,v 1.23 1997/12/15 16:17:20 roberto Exp roberto $
** Syntax analizer and code generator ** Syntax analizer and code generator
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -664,8 +664,7 @@ TProtoFunc *luaY_parser (ZIO *z, char *chunkname)
counter */ counter */
%type <vInt> varlist1, funcParams, funcvalue %type <vInt> varlist1, funcParams, funcvalue
%type <vInt> fieldlist, localnamelist, decinit %type <vInt> fieldlist, localnamelist, decinit
%type <vInt> ffieldlist, ffieldlist1, semicolonpart %type <vInt> ffieldlist1, lfieldlist1, ffieldlist, lfieldlist, part
%type <vInt> lfieldlist, lfieldlist1
%type <vLong> var, funcname /* vardesc */ %type <vLong> var, funcname /* vardesc */
%type <pFunc> body %type <pFunc> body
@ -861,25 +860,35 @@ parlist : /* empty */ { code_args(0, 0); }
| localnamelist ',' DOTS { code_args($1, 1); } | localnamelist ',' DOTS { code_args($1, 1); }
; ;
fieldlist : lfieldlist fieldlist : part { $$ = abs($1); }
{ flush_list($1/LFIELDS_PER_FLUSH, $1%LFIELDS_PER_FLUSH); } | part ';' part
semicolonpart {
{ $$ = $1+$3; } if ($1*$3 > 0) /* repeated parts? */
| ffieldlist1 lastcomma luaY_error("invalid constructor syntax");
{ $$ = $1; flush_record($1%RFIELDS_PER_FLUSH); } $$ = abs($1)+abs($3);
; }
;
semicolonpart : /* empty */ { $$ = 0; } part : /* empty */ { $$ = 0; }
| ';' ffieldlist { $$ = $2; flush_record($2%RFIELDS_PER_FLUSH); } | ffieldlist { $$ = $1; }
; | lfieldlist { $$ = $1; }
;
lastcomma : /* empty */ lastcomma : /* empty */ | ',' ;
| ','
;
ffieldlist : /* empty */ { $$ = 0; } ffieldlist : ffieldlist1 lastcomma
| ffieldlist1 lastcomma { $$ = $1; } {
; flush_record($1%RFIELDS_PER_FLUSH);
$$ = -$1; /* negative signals a "record" part */
}
;
lfieldlist : lfieldlist1 lastcomma
{
flush_list($1/LFIELDS_PER_FLUSH, $1%LFIELDS_PER_FLUSH);
$$ = $1;
}
;
ffieldlist1 : ffield {$$=1;} ffieldlist1 : ffield {$$=1;}
| ffieldlist1 ',' ffield | ffieldlist1 ',' ffield
@ -897,10 +906,6 @@ ffieldkey : '[' expr1 ']'
| NAME { code_string($1); } | NAME { code_string($1); }
; ;
lfieldlist : /* empty */ { $$ = 0; }
| lfieldlist1 lastcomma { $$ = $1; }
;
lfieldlist1 : expr1 {$$=1;} lfieldlist1 : expr1 {$$=1;}
| lfieldlist1 ',' expr1 | lfieldlist1 ',' expr1
{ {