diff -r e8563dcaefca -r 56ebe2a31b5b stage4/generate_c/generate_c_sfc.cc --- a/stage4/generate_c/generate_c_sfc.cc Mon Apr 03 22:06:40 2017 +0100 +++ b/stage4/generate_c/generate_c_sfc.cc Mon Apr 03 22:18:22 2017 +0100 @@ -443,7 +443,7 @@ for(int i = 0; i < symbol->n; i++) { s4o.print(GET_VAR); s4o.print("("); - print_step_argument(symbol->elements[i], "X"); + print_step_argument(symbol->get_element(i), "X"); s4o.print(")"); if (i < symbol->n - 1) { s4o.print(" && "); @@ -452,12 +452,12 @@ break; case stepset_sg: for(int i = 0; i < symbol->n; i++) { - print_set_step(symbol->elements[i]); + print_set_step(symbol->get_element(i)); } break; case stepreset_sg: for(int i = 0; i < symbol->n; i++) { - print_reset_step(symbol->elements[i]); + print_reset_step(symbol->get_element(i)); } break; default: @@ -710,8 +710,8 @@ generate_c_sfc_elements->reset_transition_number(); for(i = 0; i < symbol->n; i++) { - symbol->elements[i]->accept(*this); - generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::transitionlist_sg); + symbol->get_element(i)->accept(*this); + generate_c_sfc_elements->generate(symbol->get_element(i), generate_c_sfc_elements_c::transitionlist_sg); } s4o.print(s4o.indent_spaces +"INT i;\n"); @@ -853,7 +853,7 @@ s4o.print(s4o.indent_spaces + "// Transitions reset steps\n"); generate_c_sfc_elements->reset_transition_number(); for(i = 0; i < symbol->n; i++) { - generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::stepreset_sg); + generate_c_sfc_elements->generate(symbol->get_element(i), generate_c_sfc_elements_c::stepreset_sg); } s4o.print("\n"); @@ -861,14 +861,14 @@ s4o.print(s4o.indent_spaces + "// Transitions set steps\n"); generate_c_sfc_elements->reset_transition_number(); for(i = 0; i < symbol->n; i++) { - generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::stepset_sg); + generate_c_sfc_elements->generate(symbol->get_element(i), generate_c_sfc_elements_c::stepset_sg); } s4o.print("\n"); /* generate step association */ s4o.print(s4o.indent_spaces + "// Steps association\n"); for(i = 0; i < symbol->n; i++) { - generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::actionassociation_sg); + generate_c_sfc_elements->generate(symbol->get_element(i), generate_c_sfc_elements_c::actionassociation_sg); } s4o.print("\n"); @@ -967,7 +967,7 @@ } } for(i = 0; i < symbol->n; i++) { - generate_c_sfc_elements->generate(symbol->elements[i], generate_c_sfc_elements_c::actionbody_sg); + generate_c_sfc_elements->generate(symbol->get_element(i), generate_c_sfc_elements_c::actionbody_sg); } s4o.print("\n");