From b29c81cf5bab7ec09fa30e3e63a2c3c4af6ad081 Mon Sep 17 00:00:00 2001
From: Stefano Zaghi <stefano.zaghi@gmail.com>
Date: Fri, 25 Oct 2024 12:11:33 +0200
Subject: [PATCH] bugfix: fix bug of preprocessing parsed files

---
 src/main/python/fobis/ParsedFile.py           |   7 ++++++-
 .../__pycache__/ParsedFile.cpython-310.pyc    | Bin 15033 -> 15105 bytes
 .../fobis/__pycache__/fobis.cpython-310.pyc   | Bin 17184 -> 17184 bytes
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/python/fobis/ParsedFile.py b/src/main/python/fobis/ParsedFile.py
index 0cef87d..2e1303e 100644
--- a/src/main/python/fobis/ParsedFile.py
+++ b/src/main/python/fobis/ParsedFile.py
@@ -341,7 +341,12 @@ def parse(self, inc=['.INC', '.F', '.FOR', '.FPP', '.F77', '.F90', '.F95', '.F03
           preprocessor += ' -C -w '
         elif preprocessor == 'fpp':
           preprocessor += ' -w '
-        source = str(check_output(preprocessor + ' ' + preproc + ' ' + '-I'.join(include) + ' ' + self.name, shell=True, stderr=STDOUT, encoding='UTF-8'))
+        if preproc is None:
+            preproc = ''
+        includes = ' '
+        if len(include) > 0 :
+            includes = ' -I' + '-I'.join(include) + ' '
+        source = str(check_output(preprocessor + ' ' + preproc + includes + self.name, shell=True, stderr=STDOUT, encoding='UTF-8'))
         source = source.replace('\\n', '\n')
       else:
         source = str(openReader(self.name).read())
diff --git a/src/main/python/fobis/__pycache__/ParsedFile.cpython-310.pyc b/src/main/python/fobis/__pycache__/ParsedFile.cpython-310.pyc
index b584345537e08fe4810caa1d032b321b9c89c919..eaa330d5c4bb82cf32e5449b3c021707e5083588 100644
GIT binary patch
delta 1164
zcmZ8fU1$_n6uxI>b!TUP)NHapZuTdejb;)y7+0!|7K@Ek5rd!&YEdg*Esc`k-AS-I
z+Ynbxv<)b?wuT_gP;C9BDPvLb!9qnS;?F~$^5}~SDt)#Odd}Evi8GvU&iT&y&N*{u
zZViqMg$Kf6o#EB|Me56`-@<1TkswBXG!?CUQ%)r^@U?uD_y`7MIGG=|RPG;SqMK_K
zl?N(*Gidp$!1et;@fi>DkgZ!j2jYwe;taDPGi)j3TPm6#jrBz^8#d?h2%k5O+KOgr
z_Iy5{FL0EK)*nU90;;NlUFR^$_Xld+aE(OKT$DgJ+wtQ`W=8FLvtf*3i+~jn-}A7=
zcEvn4USltMYyz7zJ81>%g}lxI2jHDLRja%2)iq)ryjPbV=21^r?*MNYS1LLdDOjY}
z+GJ{N-k8}@whwrW$B$`dt{dN_3gtI5gY71V@x*>r%x03rnCbuK;DWQ}4F5kUKQrhw
zh>Z89&BUCBat7rKXU5Eud+LLuxO4(lC9_b)53;KT<CeZfmc~=#cp4Phiyh{9G3>YH
zU46ONVr%*uk=Sbb`ZT-MLj#i$I!4}@WEKnoHs0<XU>o;uX78Jkb~mOf5bY5w@dtYi
zIRW@QtmcaA<%7mQ!IWpxn-!y7K25LnO{)j?y6u@FKu~VWuGXiuuln~K8034)@?5r{
ze}~F0l$VF(y=+rZ10UWYsDnlBvuvFTqwc@?mjDy;d0{6^y6ak2tMHc`Yu#PEh)QvZ
zU@^hvn&*YB6kb7ih|R@S88c25D11z_6m$~ou%0Wd$`uE4g^zV3BsP)aq`Yh7(^Yc6
zA*dis`#7#_XyS8XCZ*c;DNMN=+PVOKkSE%k=1d^}w|lj{AK(|6Dt64FK`&%aaj5ME
zdWIs_k<uG*lRR(3*=xR%uZkPsiQCn&Q^771OUB?QneQyYb=lk51pmlGov)+UP~2nq
zL@zb@fS@XmFZ~dj<(;J?1v*M`p5SMK-w9|nahu={!5{M16>)i_l#FfE>a_;Fphxsb
zs3bnYq_I`pm6uBsL5C_k2yC}!S(n;yg8WkiBLqhYj=SfVD=>GA{BPY0E9#ZE<1j9D

delta 1048
zcmZuvTSyd97@mJ-ZD&Vk)m_(JZ|kaSI%_W4ij@!&T1kQgLIjZ(J4UX$);QVAEaoM=
z#DZ|j3qj35cY8=CiVC`5FA-%=Jp?`U5D_Ip^dtoRXJm!6f%)eDzw>?Hf9A{#4?a03
z_KTvx;59J)vn#kLUhz3;YsZ_T>>PRE^FudT_U(mEBIcD2sp)El#>#dtqj6q_K4o4P
zG@AkIoyNpOtQ@LS7UcA#Z4?rA&8}z48M0`w347d)30YJ%3VOD|(Dk@uD~FzK=zwPC
z`0OO3x^%aiGr<@`Y=YN#WlVNxOsB`9bCF(W=PcHX;f(Incs);c8ejmd+w(Vc&n#U5
z>R^+uP|mb`Sq8}2Nj8B~Vk~MLsgxnLXd`A-^^Y^BKz7OQF<vch#&;Qofz{MtJzy|$
zP7kO2%XlcGrUu~#|364ANzIuC#c920DKbOsGz>V=o|_u8)qeIo?%IpCGPP`!!E*{?
zAB>f2cG;W6)1aNc-C(TBgL%#C`hf%ZEWo}+wZ(Y7!oo`A@H5~xeR+%qrGtRMhpYpX
z<h*uf^DX6@eFX{N)*wLs6fQwOc~#WTwMik8>)&sl@b3T+NV2$*d@K$Mm+&8J0Q}E-
zi7ik9b!JV##leW#RJH;zOKQtIV8)y-Z{*-L`A~T>>lW&j+Y~A&+#&lUw{REBHyEPa
zBOTII8g1W_70C}1BqLN>G=lvnuD2_$Bxq%myW>%bSB_z$%#+s8L0B+Jr~%+Id0$nM
zHjDhS`MW9(aFax<!&crmGE+V1dW1_7tF%z(VG57wd`s}1)Q4N)vpEv(VA1!bW&#Wn
ztBrt37AxJEV)S%Zw5K!L-*=|Fx9bOaS-a+5z=Sr*rW~P3^%O?PyPbQ$PwbK5AUzr7
zDuo*q9#WuNQ=U?IPT>W)AF0W0;d6M85EPt(Gb5rj;evEjSt7q8^Xb>ADoo*;IaAlb
dc`nj=lEMWF!xYBMue(^-Hcsm)b7gl9`xm<<9Si^f

diff --git a/src/main/python/fobis/__pycache__/fobis.cpython-310.pyc b/src/main/python/fobis/__pycache__/fobis.cpython-310.pyc
index d231e41a304e74f80acdb0c5923a62e275ce7d38..fdcd05774f3a55a352c3e3db35bf9eba85a30322 100644
GIT binary patch
delta 22
ccmZ3`#<-x3kvpH4mx}=iY|g#g$Svv&07bn8`2YX_

delta 22
ccmZ3`#<-x3kvpH4mx}=i%=_MK<Q8=X07MW4vH$=8