diff --git a/src/code_.py b/src/code_.py index 079e16765819da79671947dff3ac9a39c9fb8beb..0ab7136c51299033e25e92373d46c1d3208429e4 100644 --- a/src/code_.py +++ b/src/code_.py @@ -20,9 +20,9 @@ class Code: self.code_wo_comments = re.sub(constant.DOUBLE_BACKSLAPSH_JUMP, ' ', self.code_wo_comments) self.code_wo_comments = re.sub(constant.BACKSLAPSH_JUMP, ' ', self.code_wo_comments) self.code_wo_comments = self.code_wo_comments.replace("||", "$OR$") - self.code_wo_comments = self.add_triple_quote_inside_map(self.code_wo_comments ) self.code_wo_comments = self.turn_single_condition_into_multiline(self.code_wo_comments) self.code_wo_comments = self.rewrite_ternary_operation_to_normal_condition(self.code_wo_comments) + self.code_wo_comments = self.add_triple_quote_inside_map(self.code_wo_comments ) self.code_wo_comments = self.rewrite_jump_dot(self.code_wo_comments) diff --git a/src/workflow.py b/src/workflow.py index 985858c8f31e6fc6f664e1ce6319989fb982dc04..96a5aca8275beea7f63ce677afe5456a465b44c4 100644 --- a/src/workflow.py +++ b/src/workflow.py @@ -452,7 +452,7 @@ George Marchment, Bryan Brancotte, Marie Schmit, Frédéric Lemoine, Sarah Cohen searching = False for match in re.finditer(r"\.(\w+)_modified\s*\{\s*¤\'\'\'([^¤]+)¤\s*\}", code): operator = match.group(1) - inside = match.group(2)[2:-3]#Cause we want to remove the extras '''...''' + inside = match.group(2)[:-3]#Cause we want to remove the extras ...''' code = code.replace(match.group(0), f".{operator} {{ {inside} }}") searching = True break