Revert "ret_str cleanup"

This reverts commit b6d46e7.
swollows · Feb 25, 2022 · 44e4412 · 44e4412
1 parent b6d46e7
commit 44e4412
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/10_angr_simprocedures/generate.py b/10_angr_simprocedures/generate.py
@@ -12,9 +12,17 @@ def recursive_if_else(variable, value, end_statement, depth):
   else:
     if_true = random.choice([True, False])
     if (if_true):
-      ret_str = 'if (' + generate_true_statement(variable, value) + ') {' + recursive_if_else(variable, value, end_statement, depth - 1) + '} else {' + recursive_if_else(variable, value, end_statement, depth - 1) + '}'
+      ret_str = 'if (' + generate_true_statement(variable, value) + ') {'
+      ret_str += recursive_if_else(variable, value, end_statement, depth - 1)
+      ret_str += '} else {'
+      ret_str += recursive_if_else(variable, value, end_statement, depth - 1)
+      ret_str += '}'
     else:
-      ret_str = 'if (!' + generate_true_statement(variable, value) + ') {' + recursive_if_else(variable, value, end_statement, depth - 1) + '} else {' + recursive_if_else(variable, value, end_statement, depth - 1) + '}'
+      ret_str = 'if (!' + generate_true_statement(variable, value) + ') {'
+      ret_str += recursive_if_else(variable, value, end_statement, depth - 1)
+      ret_str += '} else {'
+      ret_str += recursive_if_else(variable, value, end_statement, depth - 1)
+      ret_str += '}'
     return ret_str
 
 def generate(argv):

diff --git a/11_angr_sim_scanf/11_angr_sim_scanf.c.jinja → ...gr_sim_scanf/11_angr_sim_scanf.c.templite b/11_angr_sim_scanf/11_angr_sim_scanf.c.jinja → ...gr_sim_scanf/11_angr_sim_scanf.c.templite