cosmetics

thomas-maeder · Nov 13, 2017 · ffeceaf · ffeceaf
1 parent 8857681
commit ffeceaf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/output/plaintext/tree/tree.c b/output/plaintext/tree/tree.c
@@ -97,7 +97,7 @@ static void do_insert_move_writer_attack(slice_index si,
                                         &traversal_insertion,&state);
 
   /* prevent 2nd operand from writing the same move again */
-  stip_structure_traversal_override_single(&traversal_insertion,STAnd,&insert_visit_pipe);
+  stip_structure_traversal_override_single(&traversal_insertion,STAnd,&slice_insertion_visit_pipe);
 
   stip_traverse_structure(si,&traversal_insertion);
 
@@ -533,7 +533,7 @@ static void insert_key_writer_goal(slice_index si, stip_structure_traversal *st)
                                                &st_nested);
 
     /* prevent 1st operand from writing the key mark; 2nd operand will write it */
-    stip_structure_traversal_override_single(&st_nested,STAnd,&insert_visit_binary_skip_next1);
+    stip_structure_traversal_override_single(&st_nested,STAnd,&slice_insertion_visit_binary_skip_next1);
 
     stip_traverse_structure(SLICE_NEXT2(si),&st_nested);
 

diff --git a/stipulation/slice_insertion.c b/stipulation/slice_insertion.c
@@ -253,7 +253,7 @@ static void insert_beyond(slice_index si, stip_structure_traversal *st)
  *       traversal at a specific slice type after having initialised the
  *       traversal using slice_insertion_init_traversal()
  */
-void insert_visit_pipe(slice_index si, stip_structure_traversal *st)
+void slice_insertion_visit_pipe(slice_index si, stip_structure_traversal *st)
 {
   TraceFunctionEntry(__func__);
   TraceFunctionParam("%u",si);
@@ -289,7 +289,8 @@ void insert_visit_pipe(slice_index si, stip_structure_traversal *st)
  *       traversal at a specific slice type after having initialised the
  *       traversal using slice_insertion_init_traversal()
  */
-void insert_visit_binary_skip_next1(slice_index si, stip_structure_traversal *st)
+void slice_insertion_visit_binary_skip_next1(slice_index si,
+                                             stip_structure_traversal *st)
 {
   TraceFunctionEntry(__func__);
   TraceFunctionParam("%u",si);
@@ -517,14 +518,14 @@ static void init_slice_insertion_traversal_common(stip_structure_traversal *st,
                                                  slice_structure_leaf,
                                                  &insert_visit_leaf);
   stip_structure_traversal_override_by_structure(st,
-                                                   slice_structure_pipe,
-                                                   &insert_visit_pipe);
+                                                 slice_structure_pipe,
+                                                 &slice_insertion_visit_pipe);
   stip_structure_traversal_override_by_structure(st,
                                                  slice_structure_branch,
-                                                 & insert_visit_pipe);
+                                                 &slice_insertion_visit_pipe);
   stip_structure_traversal_override_by_structure(st,
                                                  slice_structure_fork,
-                                                 &insert_visit_pipe);
+                                                 &slice_insertion_visit_pipe);
   stip_structure_traversal_override_by_contextual(st,
                                                   slice_contextual_binary,
                                                   &insert_visit_binary);

diff --git a/stipulation/slice_insertion.h b/stipulation/slice_insertion.h
@@ -126,7 +126,7 @@ void slice_insertion_prepare_factored_order(slice_index si,
  *       traversal at a specific slice type after having initialised the
  *       traversal using slice_insertion_init_traversal()
  */
-void insert_visit_pipe(slice_index si, stip_structure_traversal *st);
+void slice_insertion_visit_pipe(slice_index si, stip_structure_traversal *st);
 
 /* Visit a binary slice during an insertion traversal; don't insert into next1,
  * but continue into next2 if the slice types to be inserted have higher rank
@@ -138,6 +138,7 @@ void insert_visit_pipe(slice_index si, stip_structure_traversal *st);
  *       traversal at a specific slice type after having initialised the
  *       traversal using slice_insertion_init_traversal()
  */
-void insert_visit_binary_skip_next1(slice_index si, stip_structure_traversal *st);
+void slice_insertion_visit_binary_skip_next1(slice_index si,
+                                             stip_structure_traversal *st);
 
 #endif