From 737074beeed9e9bc09c02d1c3d79942b056924e4 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Mon, 18 Sep 2017 10:58:11 +0200
Subject: [PATCH] Fixed regexp

---
 src/lib/__init__.pyc     | Bin 141 -> 134 bytes
 src/lib/manager.pyc      | Bin 287 -> 280 bytes
 src/lib/static_ashes.pyc | Bin 93601 -> 91900 bytes
 src/preprocessed_text.py |  25 ++++++++++++++++---------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/lib/__init__.pyc b/src/lib/__init__.pyc
index b58c681ebfa8de0f73ff52826fd93fd1c7162296..fda89b24b05aa0a6186be84f5003666520adc94a 100644
GIT binary patch
delta 36
rcmeBWY-40+{>;mDs&)TFb~8bJ1_lQGjQreG{o>@*+{E0(iJ=w%#kC7U

delta 43
xcmZo;>}6zU{>;lYTR3$hyP1R;0|SG8Mt*LpesOYYZenhteh844SUl0s0s#Lw4Cw#>

diff --git a/src/lib/manager.pyc b/src/lib/manager.pyc
index 1d835e9c91b7d1680cd7ed4f57b7b63aba98546b..da68ae9384ba22e4f634129bab127cbc3e325e59 100644
GIT binary patch
delta 36
scmbQwG=qtq`7<xqsn-1y*>?--F)%RbXXNLm>K7-c<|gJQPQ2v`0M}LwegFUf

delta 43
xcmbQiG@pr``7<xqY~j?2?7JmQ85kJ!GxBp&^^22Ja}#qD^+SNX#NvsUT>%x24kZ8p

diff --git a/src/lib/static_ashes.pyc b/src/lib/static_ashes.pyc
index 6eabe599133798422b085653b19f05b36c7db06f..fb233977cc8425d58fa6eb2164796fe8facdced4 100644
GIT binary patch
delta 6630
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
F>0e8cdt(3q

delta 8297
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
F{0p8~)Z737

diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py
index 0622583..7c9f256 100644
--- a/src/preprocessed_text.py
+++ b/src/preprocessed_text.py
@@ -389,6 +389,9 @@ def add_operators(text):
     re_incr = re.compile(r"(\s*)(.*)(\+=)(.*$)", re.S)
     re_decr = re.compile(r"(\s*)(.*)(-=)(.*$)", re.S)
     re_mult = re.compile(r"(\s*)(.*)(\*=)(.*$)", re.S)
+    re_incr_if = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)", re.S)
+    re_decr_if = re.compile(r"(.*)(\))(\s*)(.*)(-=)(.*$)", re.S)
+    re_mult_if = re.compile(r"(.*)(\))(\s*)(.*)(\*=)(.*$)", re.S)
     '''Change additional operators'''
     result = []
     for line in text:
@@ -398,16 +401,20 @@ def add_operators(text):
            ls.startswith('print*') or \
            ls.startswith('write('):
             pass
-        elif "+=" in buffer:
-            if buffer.lstrip().startswith("if "):
-                re_incr = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)", re.S)
-                line.text = re.sub(re_incr, r'\1\2\4=\4+(\6)', buffer)
-            else:
+        elif buffer.lstrip().startswith("if "):
+            if "+=" in buffer:
+                line.text = re.sub(re_incr_if, r'\1\2\4=\4+(\6)', buffer)
+            elif "-=" in buffer:
+                line.text = re.sub(re_incr_if, r'\1\2\4=\4-(\6)', buffer)
+            elif "*=" in buffer:
+                line.text = re.sub(re_incr_if, r'\1\2\4=\4*(\6)', buffer)
+        else:
+            if "+=" in buffer:
                 line.text = re.sub(re_incr, r'\1\2=\2+(\4)', buffer)
-        elif "-=" in buffer:
-            line.text = re.sub(re_decr, r'\1\2=\2-(\4)', buffer)
-        elif "*=" in buffer:
-            line.text = re.sub(re_mult, r'\1\2=\2*(\4)', buffer)
+            elif "-=" in buffer:
+                line.text = re.sub(re_decr, r'\1\2=\2-(\4)', buffer)
+            elif "*=" in buffer:
+                line.text = re.sub(re_mult, r'\1\2=\2*(\4)', buffer)
         result.append(line)
     return result