From f4e370adec9fb18256a9567096e6336b050a2c3e Mon Sep 17 00:00:00 2001 From: Tue Herlau <tuhe@dtu.dk> Date: Fri, 10 Jun 2022 14:31:54 +0200 Subject: [PATCH] updates --- .../__pycache__/block_parsing.cpython-38.pyc | Bin 3510 -> 3562 bytes src/snipper/__pycache__/fix_bf.cpython-38.pyc | Bin 3786 -> 6417 bytes src/snipper/fix_bf.py | 10 +++------- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/snipper/__pycache__/block_parsing.cpython-38.pyc b/src/snipper/__pycache__/block_parsing.cpython-38.pyc index cb029cce281298d5b7f761b09068fdbd689ab7af..c0381cb2e030f70d1fb883d7e226012dc67a508b 100644 GIT binary patch delta 176 zcmdlc{YsiIl$V!_0SKz47bmguZ{(BaWNe$P#Tgrz!cxPW%~n)Z!(79>fFXrtA!7<d zE0ZL{0;Yuwwaj@eDa^G%nHrWfreFq5R=*-)pdm$!AVM8Phyn>s<{}mln;AsNPhQ38 zAuI%BGB64-8ZdG&@-eXhNr}z>Ib|6cc_+(qS2Lzfp2@wMF>A6b&kn|@$^Up%7>gz= N^Y*d2aj<Z4005^QBiH}{ delta 124 zcmaDQy-k`gl$V!_0SG)YToUv7Hu6bxGA2#d;*3?UVXk3GV+v-_WbrE!1}Z3G1QF^$ zLX)Y81;l2ae1p@2mj}pXU=(09VB}!r+ic7w%gD$%Igq;=Xv|se)r@JAD|vP>-kNO0 StHPK!Ih?nT)ro_Jivs}SUKt|* diff --git a/src/snipper/__pycache__/fix_bf.cpython-38.pyc b/src/snipper/__pycache__/fix_bf.cpython-38.pyc index cde78db9fdc1de042e6d4859666771c801ae6339..bc18996243ae1f5ef47e9efe7b95ebaaa7311a65 100644 GIT binary patch literal 6417 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 C-yPrp delta 849 zcmZWnO=}ZD7@l`#zq{KMY)u0dYAJ<9@uNr&T8r_c?Mbk$SQaFZog~I=5}DnKhY3AY zFXE-FHx(581M0;e;6X(E0rBWb51u@E(f8d@s5rws^E|W9yz{=Zv%mQ1*zV0B@EEqw ziq{{P82d)za1$sl;Yc?SB$JS^h-RKZmq#3ki$rvd$SAmh+>Few6<Mf#X-WGbM79j1 zBVA;U9G9LPL*`1@6f7*g`EW}>_-@9?Oz`u4cN>EIhkJMT6do9x2nWqYV&S-gBmISt zF^vgT*d7c_Ez<1_M*1axg=-QzT%ExcF4-eqVLh(dfE6B5VTU|h=)ofX_3Z7!z|x#- z0~<Hl7|`gL>WQ}LNNHkl;(WAmU~4G6poMxZtrlo&k`0{Rx;E6?7BY$Pdgn0`6sZ~N zqc$~^Sqpl+#k47HZ9QYsc_GTA+zZ-9>5**lG6v9&wwipCg=5zhVD-u-m_Yc>5q`s5 zWUo~>E?3vC<@^4{NulW9sUrka2%)QH^Pm3AojDXkD{Uu@UZxgE@HigwMnjz>FJ1Ep z0{Z6F>PbKD)S5fJb=2uR0s|imn8)s5pGM`N_PK#*@dX(FV{x^Ve+}M4DStY?b()e0 zg&M<2oj@4E{r}EcmhCu;``vphGB1~IoI6YAMFL7VG?hUc&34x4rs^oIFA>lS32ik? zd@g@pTJVds&1U;St$sWIQmPyWhkHU@B_phce07y3Z|Gu4an|oAX&y~4SLwZtLXz`P fdc}nlL7nApU+yH06}tb_M{uxqA0~uX^``y;e2S;P diff --git a/src/snipper/fix_bf.py b/src/snipper/fix_bf.py index 00fb61d..64f33fb 100644 --- a/src/snipper/fix_bf.py +++ b/src/snipper/fix_bf.py @@ -69,7 +69,7 @@ def fix_f(lines, debug, keep=False): return lines2 # stats = {'n': 0} -def _block_fun(lines, start_extra, end_extra, keep=False, permute=False, questionmarks=false, halfquestionmarks=False, silent=False): +def _block_fun(lines, start_extra, end_extra, keep=False, permute=False, questionmarks=False, halfquestionmarks=False, silent=False): methods = {'remove': 0} # if method not in ['remove', 'permute', 'questionmark', 'halfquestionmark']: # assert False @@ -124,15 +124,11 @@ def fix_b(lines, keep=False): if b == None: break args = {k:v for k, v in b['start_tag_args'].items() if len(k) > 0} -<<<<<<< HEAD cutout.append( b['block'] ) b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg2'], **args, keep=keep) -======= - cutout += b['block'] + # cutout += b['block'] # method = b['start_tag_args'].get('', 'remove') - b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg1'], **args, keep=keep) - ->>>>>>> 1006ff966030717f7654e4b98720394bb394bb57 + # b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg1'], **args, keep=keep) lines = block_join(b) # cutout +_= n += dn -- GitLab