Branch: Tag:

2016-05-14

2016-05-14 14:24:20 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Compiler: Fixed remaining reduce/reduce conflicts.

1316:    | TOK_PROGRAM_ID opt_program_type { push_type(T_PROGRAM); }    | TOK_ARRAY_ID opt_array_type { push_type(T_ARRAY); }    | TOK_MULTISET_ID opt_array_type { push_type(T_MULTISET); } -  | typeof -  { -  if ($1) { -  push_finished_type($1->u.sval.u.type); -  } -  free_node($1); -  } +     | TOK_ATTRIBUTE_ID '(' string_constant ',' full_type ')'    {    push_type_attribute($3->u.sval.u.string);
1450:    pop_stack();    free_node($1);    } +  | typeof +  { +  if ($1) { +  push_finished_type($1->u.sval.u.type); +  free_node($1); +  } else { +  push_finished_type(mixed_type_string); +  } +  }    ;      number_or_maxint: /* Empty */