diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index ae081767..6159e69e 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,7 +13,7 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 617, + BUILD_REVISION => 618, BUILD_DATE => "2014-06-07", }; diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm index ff08b075..10c3fe86 100644 --- a/modules/c2english/CGrammar.pm +++ b/modules/c2english/CGrammar.pm @@ -25,7 +25,7 @@ startrule : translation_unit startrule(?) translation_unit : (comment - | global_var_declaration + | external_declaration | function_definition | function_prototype | preproc[matchrule => 'translation_unit']) @@ -145,7 +145,7 @@ token : /\S+/ $return =~ s/"/\\"/; # escaping all quotes. } -global_var_declaration : declaration +external_declaration : declaration function_definition : declaration_specifiers(?) declarator[context => 'function_definition'] '(' parameter_type_list(?) ')' '{' declaration_list(?) statement_list(?) '}'