Skip to content
Snippets Groups Projects
Commit 9bb91d78 authored by Elizabeth's avatar Elizabeth
Browse files

Cleaned up code

parent 70cb1583
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,18 @@ def get_new_path(old_path, orig_source_code_dir): ...@@ -46,7 +46,18 @@ def get_new_path(old_path, orig_source_code_dir):
# "complete_line" = a valid line of code # "complete_line" = a valid line of code
def replace_function_calls(complete_line, knob_config): def get_new_function_calls(complete_line, knob_config):
'''
Returns a copy of an inputted line of code such that all instances of old
function calls are replaced with newFunctionCall(old params, knobs)
Note: The old calls aren't completely overriden, as we still need the old parameters but
insert new parameters as well
Args:
complete_line: A complete line of code to process
knob_config: KnobConfiguration object representing current configuration
'''
orig_func_ind = complete_line.find(knob_config.orig_func_name) orig_func_ind = complete_line.find(knob_config.orig_func_name)
new_line = [] new_line = []
line_start_ind = 0 line_start_ind = 0
...@@ -57,8 +68,7 @@ def replace_function_calls(complete_line, knob_config): ...@@ -57,8 +68,7 @@ def replace_function_calls(complete_line, knob_config):
line_start_ind = complete_line.find(")", orig_func_ind) + 1 line_start_ind = complete_line.find(")", orig_func_ind) + 1
old_func_call = complete_line[complete_line.find("(", orig_func_ind): line_start_ind] old_func_call = complete_line[complete_line.find("(", orig_func_ind): line_start_ind]
new_line.append(knob_config.modified_func_name + old_func_call[:-1] + ", " \ new_line.append("%s%s, %s)" % (knob_config.modified_func_name, old_func_call[:-1], ', '.join(knob_config.params)))
+ ', '.join(knob_config.params) + ")")
orig_func_ind = complete_line.find(knob_config.orig_func_name, line_start_ind) orig_func_ind = complete_line.find(knob_config.orig_func_name, line_start_ind)
new_line.append(complete_line[line_start_ind : ]) new_line.append(complete_line[line_start_ind : ])
#print(new_line) #print(new_line)
...@@ -110,7 +120,7 @@ def generate_source_code(table, dir_name, filename, source_name): ...@@ -110,7 +120,7 @@ def generate_source_code(table, dir_name, filename, source_name):
complete_line += line complete_line += line
orig_func_ind = complete_line.find(knob_config.orig_func_name) orig_func_ind = complete_line.find(knob_config.orig_func_name)
if orig_func_ind != -1: if orig_func_ind != -1:
new_file_contents.append(replace_function_calls(complete_line, knob_config)) new_file_contents.append(get_new_function_calls(complete_line, knob_config))
else: else:
new_file_contents.append(complete_line) new_file_contents.append(complete_line)
complete_line = "" complete_line = ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment