- let id1 = Grammar.get_id1 g t in
- let id2 = Grammar.get_id2 g t in
- let param_pos = Grammar.get_param_pos t in
- let nparam1 = Grammar.num_children id1 in
- let nparam2 =
- if Grammar.is_terminal id2 && nil_symbol == (Grammar.terminal id2) then 0
- else Grammar.num_children id2
- in
+ let rhs = Grammar2.get_rule g t in
+ let id1 = Grammar2.get_id1 rhs in
+ let id2 = Grammar2.get_id2 rhs in
+ let param_pos = Grammar2.get_id2_pos rhs in
+ let nparam1 = Grammar2.get_id1_rank rhs in
+ let nparam2 = Grammar2.get_id2_rank rhs in