diff --git a/ChangeLog b/ChangeLog index 7c3e242..ef7a6ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Mar 24 02:47:41 2008 Minero Aoki + + * net/loveruby/cflat/parser/Parser.jj: defvar -> defvars (again). + Mon Mar 24 02:39:14 2008 Minero Aoki * net/loveruby/cflat/parser/Parser.jj: top_decls -> top_defs diff --git a/net/loveruby/cflat/parser/Parser.jj b/net/loveruby/cflat/parser/Parser.jj index c41442f..4381be4 100644 --- a/net/loveruby/cflat/parser/Parser.jj +++ b/net/loveruby/cflat/parser/Parser.jj @@ -469,7 +469,7 @@ Declarations top_defs(): ( LOOKAHEAD(storage() typeref() "(") defun=defun() { decls.addDefun(defun); } | LOOKAHEAD(3) - defvars=defvar() { decls.addDefvars(defvars); } + defvars=defvars() { decls.addDefvars(defvars); } | defstruct=defstruct() { decls.addDefstruct(defstruct); } | defunion=defunion() { decls.addDefunion(defunion); } | typedef=typedef() { decls.addTypedef(typedef); } @@ -480,8 +480,8 @@ Declarations top_defs(): } // #@@} -// #@@range/defvar{ -List defvar(): +// #@@range/defvars{ +List defvars(): { List defs = new ArrayList(); boolean priv; @@ -604,7 +604,7 @@ List defvar_list(): List vars; } { - ( vars=defvar() { result.addAll(vars); } )* + ( vars=defvars() { result.addAll(vars); } )* { return result; }