@@ -241,25 +241,23 @@ def process_lines_of_fline(self, f_line, lines, rel_ind, rel_ind_con,
241
241
242
242
if is_new :
243
243
if not valid_new :
244
- raise FPrettifyParseError (filename , line_nr )
245
- else :
246
- line_indents = [ind + indents [- 1 ] for ind in line_indents ]
247
- old_ind = indents [- 1 ]
244
+ logger .debug ('%s:%d invalid new statement' , filename , line_nr )
245
+ line_indents = [ind + indents [- 1 ] for ind in line_indents ]
246
+ old_ind = indents [- 1 ]
248
247
249
- # prevent originally unindented do/if blocks
250
- # from being indented:
251
- rel_ind += old_ind
252
- indents .append (rel_ind )
248
+ # prevent originally unindented do/if blocks
249
+ # from being indented:
250
+ rel_ind += old_ind
251
+ indents .append (rel_ind )
253
252
254
253
elif is_con :
255
254
if not valid_con :
256
- raise FPrettifyParseError (filename , line_nr )
257
- else :
258
- line_indents = [ind + indents [- 2 ] for ind in line_indents ]
255
+ logger .debug ('%s:%d invalid continue statement' , filename , line_nr )
256
+ line_indents = [ind + indents [- 2 ] for ind in line_indents ]
259
257
260
258
elif is_end :
261
259
if not valid_end :
262
- raise FPrettifyParseError ( filename , line_nr )
260
+ logger . debug ( '%s:%d invalid end statement' , filename , line_nr )
263
261
else :
264
262
line_indents = [ind + indents [- 2 ] for ind in line_indents ]
265
263
indents .pop ()
@@ -327,7 +325,8 @@ def process_lines_of_fline(self, f_line, lines, rel_ind, line_nr):
327
325
self ._line_indents .append (self ._br_indent_list [- 1 ])
328
326
329
327
if len (self ._br_indent_list ) > 2 or self ._level :
330
- raise FPrettifyParseError (self ._filename , self ._line_nr )
328
+ logger = logging .getLogger ('prettify-logger' )
329
+ logger .debug ('%s:%d unpaired bracket delimiters' , self ._filename , self ._line_nr )
331
330
332
331
def get_lines_indent (self ):
333
332
"""
@@ -337,6 +336,8 @@ def get_lines_indent(self):
337
336
338
337
def __align_line_continuations (self , line , is_decl , indent_size , line_nr ):
339
338
339
+ logger = logging .getLogger ('prettify-logger' )
340
+
340
341
indent_list = self ._br_indent_list
341
342
level = self ._level
342
343
filename = self ._filename
@@ -373,10 +374,11 @@ def __align_line_continuations(self, line, is_decl, indent_size, line_nr):
373
374
if not instring and what_del_close :
374
375
what_del_close = what_del_close .group ()
375
376
end_of_delim = pos + len (what_del_close ) - 1
376
- level += - 1
377
- indent_list .pop ()
378
- if level < 0 :
379
- raise FPrettifyParseError (filename , line_nr )
377
+ if level > 0 :
378
+ level += - 1
379
+ indent_list .pop ()
380
+ else :
381
+ logger .debug ('%s:%d unpaired bracket delimiters' , filename , line_nr )
380
382
381
383
if pos_ldelim :
382
384
pos_ldelim .pop ()
@@ -389,7 +391,7 @@ def __align_line_continuations(self, line, is_decl, indent_size, line_nr):
389
391
if what_del_open == r"[" :
390
392
valid = what_del_close == r"]"
391
393
if not valid :
392
- raise FPrettifyParseError ( filename , line_nr )
394
+ logger . debug ( '%s:%d unpaired bracket delimiters' , filename , line_nr )
393
395
else :
394
396
pos_rdelim .append (pos )
395
397
rdelim .append (what_del_close )
@@ -483,6 +485,9 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
483
485
# 2: relational operators
484
486
# 3: logical operators
485
487
# 4: arithm. operators plus and minus
488
+
489
+ logger = logging .getLogger ('prettify-logger' )
490
+
486
491
if whitespace == 0 :
487
492
spacey = [0 , 0 , 0 , 0 , 0 ]
488
493
elif whitespace == 1 :
@@ -546,6 +551,7 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
546
551
level += 1 # new scope
547
552
# add separating whitespace before opening delimiter
548
553
# with some exceptions:
554
+ # FIXME: duplication of regex
549
555
if ((not re .search ((r"(" + DEL_OPEN_STR +
550
556
r"|[\w\*/=\+\-:])\s*$" ),
551
557
line [:pos ], RE_FLAGS ) and
@@ -562,7 +568,10 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
562
568
563
569
# format closing delimiters
564
570
else :
565
- level += - 1 # close scope
571
+ if level > 0 :
572
+ level += - 1 # close scope
573
+ else :
574
+ logger .debug ('%s:%d unpaired bracket delimiters' , filename , line_nr )
566
575
# add separating whitespace after closing delimiter
567
576
# with some exceptions:
568
577
if not re .search (r"^\s*(" + DEL_CLOSE_STR + r"|[,%:/\*])" ,
@@ -696,7 +705,7 @@ def format_single_fline(f_line, whitespace, linebreak_pos, ampersand_sep,
696
705
lines_out .append (line [linebreak_pos_ftd [- 1 ]:])
697
706
698
707
if level != 0 :
699
- raise FPrettifyParseError ( filename , line_nr )
708
+ logger . debug ( '%s:%d unpaired bracket delimiters' , filename , line_nr )
700
709
701
710
return lines_out
702
711
0 commit comments