From dad067c7e39224c75027c3adc6fc104fe95eb166 Mon Sep 17 00:00:00 2001 From: oleting Date: Sat, 26 Dec 2020 18:19:50 +0100 Subject: [PATCH] + fix while --- gui/gui.py | 24 ++++++++++++++---------- interpreter/interpret_source.py | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gui/gui.py b/gui/gui.py index 2c845b9..d424382 100644 --- a/gui/gui.py +++ b/gui/gui.py @@ -94,12 +94,12 @@ class Gui: if event == '-OUTPUT FOLDER-': logging.debug(('event = ' + str(event) + - ' value = ' + str(values['-OUTPUT FOLDER-']))) + ' value = ' + str(values['-OUTPUT FOLDER-']))) fnames = output(values) window['-OUTPUT FILE LIST-'].update(fnames) elif event == '-OUTPUT FILE LIST-': logging.debug(('event = ' + str(event) + - ' value = ' + str(values['-OUTPUT FILE LIST-']))) + ' value = ' + str(values['-OUTPUT FILE LIST-']))) try: filename = os.path.join( values["-OUTPUT FOLDER-"], values["-OUTPUT FILE LIST-"][0] @@ -110,13 +110,13 @@ class Gui: pass if event == '-JAVA FOLDER-': logging.debug(('event = ' + str(event) + - ' value = ' + str(values['-JAVA FOLDER-']))) + ' value = ' + str(values['-JAVA FOLDER-']))) folder = values['-JAVA FOLDER-'] window['-JAVA FOLDER-'].update(values['-JAVA FILE-']) elif event == '-CREATE-': logging.debug(('event = ' + str(event) + - 'values = ' + str(values))) + 'values = ' + str(values))) try: if values['-JAVA FOLDER-'] and values['-OUTPUT FOLDER-']: logging.debug( @@ -132,21 +132,25 @@ class Gui: window['-OUTPUT FILE LIST-'].update(fnames) sg.popup_notify('Succsessful created!', title='Created') - + except JavaSyntaxError as JsE: - logging.error(('||SyntaxError in Java File|| Failed to create Image with values = ' + str(values))) + logging.error( + ('||SyntaxError in Java File|| Failed to create Image with values = ' + str(values))) sg.popup_error((str(JsE))) except ScopeNotFoundException as SnFe: - logging.error(('||ScopeNotFoundExeption|| Failed to create Image with values = ' + str(values))) + logging.error( + ('||ScopeNotFoundExeption|| Failed to create Image with values = ' + str(values))) sg.popup_error((str(SnFe))) except FileNotFoundError as FnFe: - logging.error(('||FileNotFoundError|| Failed to create Image with values = ' + str(values))) - sg.popup_error((str(FnFe) + 'File ' + str(file_path) + ' or ' + str(output_path) + ' is not reachable.')) + logging.error( + ('||FileNotFoundError|| Failed to create Image with values = ' + str(values))) + sg.popup_error( + (str(FnFe) + 'File ' + str(file_path) + ' or ' + str(output_path) + ' is not reachable.')) except: logging.error( ('Failed to create Image with values = ' + str(values))) sg.popup_error(('Failed to create an image. ')) - raise + raise elif values['-JAVA FOLDER-']: logging.error('No Output') diff --git a/interpreter/interpret_source.py b/interpreter/interpret_source.py index 505536d..e1b75f7 100644 --- a/interpreter/interpret_source.py +++ b/interpreter/interpret_source.py @@ -60,7 +60,7 @@ def get_instructions_in_scope(src: List[str], start_idx: int = 0) -> Tuple[List[ brace_offset = get_scope_start_offset(src, i) child_instructions, i = get_instructions_in_scope(src, i+brace_offset) - outer_scope.append(while_instruction_front(instruction_txt, child_instructions)) + outer_scope.append(while_instruction_front(('while ' + instruction_txt), child_instructions)) elif line.startswith("if("): logging.debug("Found if instruction in line: %i", i+1) @@ -91,7 +91,7 @@ def get_instructions_in_scope(src: List[str], start_idx: int = 0) -> Tuple[List[ bracket_idx = end_line.rindex(");") instruction_txt = end_line[7: bracket_idx] - outer_scope.append(while_instruction_back(instruction_txt, child_instructions)) + outer_scope.append(while_instruction_back(('do while' + instruction_txt), child_instructions)) else: logging.debug("Found generic instruction in line: %i", i+1)