Permalink
Browse files

I used the wrong %type for subtags rule in imcc.y. Fix that to make g…

…++ shut up. Fix a function declaratio and prototype that got mangled/lost in the merge
  • Loading branch information...
1 parent f957d20 commit 5f0a29cf63f6f9bf650a0bbcae81a59590df8e6f @Whiteknight Whiteknight committed Aug 13, 2011
Showing with 349 additions and 334 deletions.
  1. +3 −1 compilers/imcc/imcc.y
  2. +333 −331 compilers/imcc/imcparser.c
  3. +10 −0 include/parrot/packfile.h
  4. +3 −2 src/packfile/api.c
@@ -1071,9 +1071,10 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
%type <i> pcc_sub_call
%type <sr> sub_param pcc_arg pcc_result pcc_args pcc_results sub_param_type_def
%type <sr> pcc_returns pcc_yields pcc_return pcc_call arg arglist the_sub multi_type
+%type <sr> subtags
%type <t> argtype_list argtype paramtype_list paramtype
%type <t> pcc_return_many
-%type <t> proto sub_proto sub_proto_list multi subtag multi_types subtags outer
+%type <t> proto sub_proto sub_proto_list multi subtag multi_types outer
%type <t> vtable instanceof subid
%type <t> method ns_entry_name
%type <i> instruction assignment conditional_statement labeled_inst opt_label op_assign
@@ -1457,6 +1458,7 @@ multi_type:
subtag:
SUBTAG '(' subtags ')' { $$ = 0; }
+ ;
subtags:
subtags COMMA STRINGC
Oops, something went wrong.

0 comments on commit 5f0a29c

Please sign in to comment.