Skip to content

Commit 4f679ec

Browse files
evaleval
authored
Merge pull request #1551 from skipkayhil/fix-warnings
Fix all 'assigned but unused variable' warnings
2 parents b641f39 + 8dd1655 commit 4f679ec

23 files changed

+148
-73
lines changed

‎lib/mail/parsers/address_lists_parser.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -32011,10 +32010,10 @@ def self.parse(data)
3201132010
_trans = if (_slen > 0 &&
3201232011
_trans_keys[_keys] <= _wide &&
3201332012
_wide <= _trans_keys[_keys + 1])
32014-
_indicies[_inds + _wide - _trans_keys[_keys]]
32015-
else
32016-
_indicies[_inds + _slen]
32017-
end
32013+
_indicies[_inds + _wide - _trans_keys[_keys]]
32014+
else
32015+
_indicies[_inds + _slen]
32016+
end
3201832017
cs = _trans_targs[_trans]
3201932018
if _trans_actions[_trans] != 0
3202032019
case _trans_actions[_trans]
@@ -33229,6 +33228,10 @@ def self.parse(data)
3322933228
end
3323033229
end
3323133230

33231+
if false
33232+
testEof
33233+
end
33234+
3323233235
if p != eof || cs < 2461
3323333236
raise Mail::Field::IncompleteParseError.new(Mail::AddressList, data, p)
3323433237
end

‎lib/mail/parsers/address_lists_parser.rl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ module Mail::Parsers
165165
%%write init;
166166
%%write exec;
167167

168+
if false
169+
testEof
170+
end
171+
168172
if p != eof || cs < %%{ write first_final; }%%
169173
raise Mail::Field::IncompleteParseError.new(Mail::AddressList, data, p)
170174
end

‎lib/mail/parsers/content_disposition_parser.rb

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -610,10 +609,10 @@ def self.parse(data)
610609
_trans = if (_slen > 0 &&
611610
_trans_keys[_keys] <= _wide &&
612611
_wide <= _trans_keys[_keys + 1])
613-
_indicies[_inds + _wide - _trans_keys[_keys]]
614-
else
615-
_indicies[_inds + _slen]
616-
end
612+
_indicies[_inds + _wide - _trans_keys[_keys]]
613+
else
614+
_indicies[_inds + _slen]
615+
end
617616
cs = _trans_targs[_trans]
618617
if _trans_actions[_trans] != 0
619618
case _trans_actions[_trans]
@@ -654,7 +653,7 @@ def self.parse(data)
654653
# Use quoted string value if one exists, otherwise use parameter value
655654
value = qstr || chars(data, param_val_s, p - 1)
656655

657-
content_disposition.parameters << {param_attr => value}
656+
content_disposition.parameters << { param_attr => value }
658657
param_attr = nil
659658
qstr = nil
660659
end
@@ -712,7 +711,7 @@ def self.parse(data)
712711
# Use quoted string value if one exists, otherwise use parameter value
713712
value = qstr || chars(data, param_val_s, p - 1)
714713

715-
content_disposition.parameters << {param_attr => value}
714+
content_disposition.parameters << { param_attr => value }
716715
param_attr = nil
717716
qstr = nil
718717
end
@@ -742,7 +741,7 @@ def self.parse(data)
742741
# Use quoted string value if one exists, otherwise use parameter value
743742
value = qstr || chars(data, param_val_s, p - 1)
744743

745-
content_disposition.parameters << {param_attr => value}
744+
content_disposition.parameters << { param_attr => value }
746745
param_attr = nil
747746
qstr = nil
748747
end
@@ -799,7 +798,7 @@ def self.parse(data)
799798
# Use quoted string value if one exists, otherwise use parameter value
800799
value = qstr || chars(data, param_val_s, p - 1)
801800

802-
content_disposition.parameters << {param_attr => value}
801+
content_disposition.parameters << { param_attr => value }
803802
param_attr = nil
804803
qstr = nil
805804
end
@@ -823,7 +822,7 @@ def self.parse(data)
823822
# Use quoted string value if one exists, otherwise use parameter value
824823
value = qstr || chars(data, param_val_s, p - 1)
825824

826-
content_disposition.parameters << {param_attr => value}
825+
content_disposition.parameters << { param_attr => value }
827826
param_attr = nil
828827
qstr = nil
829828
end
@@ -857,7 +856,7 @@ def self.parse(data)
857856
# Use quoted string value if one exists, otherwise use parameter value
858857
value = qstr || chars(data, param_val_s, p - 1)
859858

860-
content_disposition.parameters << {param_attr => value}
859+
content_disposition.parameters << { param_attr => value }
861860
param_attr = nil
862861
qstr = nil
863862
end
@@ -875,7 +874,7 @@ def self.parse(data)
875874
# Use quoted string value if one exists, otherwise use parameter value
876875
value = qstr || chars(data, param_val_s, p - 1)
877876

878-
content_disposition.parameters << {param_attr => value}
877+
content_disposition.parameters << { param_attr => value }
879878
param_attr = nil
880879
qstr = nil
881880
end
@@ -888,6 +887,10 @@ def self.parse(data)
888887
end
889888
end
890889

890+
if false
891+
testEof
892+
end
893+
891894
if p != eof || cs < 40
892895
raise Mail::Field::IncompleteParseError.new(Mail::ContentDispositionElement, data, p)
893896
end

‎lib/mail/parsers/content_disposition_parser.rl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ module Mail::Parsers
7575
%%write init;
7676
%%write exec;
7777

78+
if false
79+
testEof
80+
end
81+
7882
if p != eof || cs < %%{ write first_final; }%%
7983
raise Mail::Field::IncompleteParseError.new(Mail::ContentDispositionElement, data, p)
8084
end

‎lib/mail/parsers/content_location_parser.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -589,7 +588,7 @@ def self.parse(data)
589588
return content_location if Mail::Utilities.blank?(data)
590589

591590
# Parser state
592-
disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
591+
qstr_s = qstr = param_val_s = nil
593592

594593
# 5.1 Variables Used by Ragel
595594
p = 0
@@ -631,10 +630,10 @@ def self.parse(data)
631630
_trans = if (_slen > 0 &&
632631
_trans_keys[_keys] <= _wide &&
633632
_wide <= _trans_keys[_keys + 1])
634-
_indicies[_inds + _wide - _trans_keys[_keys]]
635-
else
636-
_indicies[_inds + _slen]
637-
end
633+
_indicies[_inds + _wide - _trans_keys[_keys]]
634+
else
635+
_indicies[_inds + _slen]
636+
end
638637
cs = _trans_targs[_trans]
639638
if _trans_actions[_trans] != 0
640639
case _trans_actions[_trans]
@@ -809,6 +808,10 @@ def self.parse(data)
809808
end
810809
end
811810

811+
if false
812+
testEof
813+
end
814+
812815
if p != eof || cs < 32
813816
raise Mail::Field::IncompleteParseError.new(Mail::ContentLocationElement, data, p)
814817
end

‎lib/mail/parsers/content_location_parser.rl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module Mail::Parsers
5454
return content_location if Mail::Utilities.blank?(data)
5555

5656
# Parser state
57-
disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
57+
qstr_s = qstr = param_val_s = nil
5858

5959
# 5.1 Variables Used by Ragel
6060
p = 0
@@ -64,6 +64,10 @@ module Mail::Parsers
6464
%%write init;
6565
%%write exec;
6666

67+
if false
68+
testEof
69+
end
70+
6771
if p != eof || cs < %%{ write first_final; }%%
6872
raise Mail::Field::IncompleteParseError.new(Mail::ContentLocationElement, data, p)
6973
end

‎lib/mail/parsers/content_transfer_encoding_parser.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -382,10 +381,10 @@ def self.parse(data)
382381
_trans = if (_slen > 0 &&
383382
_trans_keys[_keys] <= _wide &&
384383
_wide <= _trans_keys[_keys + 1])
385-
_indicies[_inds + _wide - _trans_keys[_keys]]
386-
else
387-
_indicies[_inds + _slen]
388-
end
384+
_indicies[_inds + _wide - _trans_keys[_keys]]
385+
else
386+
_indicies[_inds + _slen]
387+
end
389388
cs = _trans_targs[_trans]
390389
if _trans_actions[_trans] != 0
391390
case _trans_actions[_trans]
@@ -509,6 +508,10 @@ def self.parse(data)
509508
end
510509
end
511510

511+
if false
512+
testEof
513+
end
514+
512515
if p != eof || cs < 21
513516
raise Mail::Field::IncompleteParseError.new(Mail::ContentTransferEncodingElement, data, p)
514517
end

‎lib/mail/parsers/content_transfer_encoding_parser.rl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ module Mail::Parsers
5757
%%write init;
5858
%%write exec;
5959

60+
if false
61+
testEof
62+
end
63+
6064
if p != eof || cs < %%{ write first_final; }%%
6165
raise Mail::Field::IncompleteParseError.new(Mail::ContentTransferEncodingElement, data, p)
6266
end

‎lib/mail/parsers/content_type_parser.rb

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -736,10 +735,10 @@ def self.parse(data)
736735
_trans = if (_slen > 0 &&
737736
_trans_keys[_keys] <= _wide &&
738737
_wide <= _trans_keys[_keys + 1])
739-
_indicies[_inds + _wide - _trans_keys[_keys]]
740-
else
741-
_indicies[_inds + _slen]
742-
end
738+
_indicies[_inds + _wide - _trans_keys[_keys]]
739+
else
740+
_indicies[_inds + _slen]
741+
end
743742
cs = _trans_targs[_trans]
744743
if _trans_actions[_trans] != 0
745744
case _trans_actions[_trans]
@@ -788,7 +787,7 @@ def self.parse(data)
788787
# Use quoted s value if one exists, otherwise use parameter value
789788
value = qstr || chars(data, param_val_s, p - 1)
790789

791-
content_type.parameters << {param_attr => value}
790+
content_type.parameters << { param_attr => value }
792791
param_attr = nil
793792
qstr = nil
794793
end
@@ -859,7 +858,7 @@ def self.parse(data)
859858
# Use quoted s value if one exists, otherwise use parameter value
860859
value = qstr || chars(data, param_val_s, p - 1)
861860

862-
content_type.parameters << {param_attr => value}
861+
content_type.parameters << { param_attr => value }
863862
param_attr = nil
864863
qstr = nil
865864
end
@@ -889,7 +888,7 @@ def self.parse(data)
889888
# Use quoted s value if one exists, otherwise use parameter value
890889
value = qstr || chars(data, param_val_s, p - 1)
891890

892-
content_type.parameters << {param_attr => value}
891+
content_type.parameters << { param_attr => value }
893892
param_attr = nil
894893
qstr = nil
895894
end
@@ -946,7 +945,7 @@ def self.parse(data)
946945
# Use quoted s value if one exists, otherwise use parameter value
947946
value = qstr || chars(data, param_val_s, p - 1)
948947

949-
content_type.parameters << {param_attr => value}
948+
content_type.parameters << { param_attr => value }
950949
param_attr = nil
951950
qstr = nil
952951
end
@@ -970,7 +969,7 @@ def self.parse(data)
970969
# Use quoted s value if one exists, otherwise use parameter value
971970
value = qstr || chars(data, param_val_s, p - 1)
972971

973-
content_type.parameters << {param_attr => value}
972+
content_type.parameters << { param_attr => value }
974973
param_attr = nil
975974
qstr = nil
976975
end
@@ -1004,7 +1003,7 @@ def self.parse(data)
10041003
# Use quoted s value if one exists, otherwise use parameter value
10051004
value = qstr || chars(data, param_val_s, p - 1)
10061005

1007-
content_type.parameters << {param_attr => value}
1006+
content_type.parameters << { param_attr => value }
10081007
param_attr = nil
10091008
qstr = nil
10101009
end
@@ -1022,7 +1021,7 @@ def self.parse(data)
10221021
# Use quoted s value if one exists, otherwise use parameter value
10231022
value = qstr || chars(data, param_val_s, p - 1)
10241023

1025-
content_type.parameters << {param_attr => value}
1024+
content_type.parameters << { param_attr => value }
10261025
param_attr = nil
10271026
qstr = nil
10281027
end
@@ -1035,6 +1034,10 @@ def self.parse(data)
10351034
end
10361035
end
10371036

1037+
if false
1038+
testEof
1039+
end
1040+
10381041
if p != eof || cs < 47
10391042
raise Mail::Field::IncompleteParseError.new(Mail::ContentTypeElement, data, p)
10401043
end

‎lib/mail/parsers/content_type_parser.rl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ module Mail::Parsers
7676
%%write init;
7777
%%write exec;
7878

79+
if false
80+
testEof
81+
end
82+
7983
if p != eof || cs < %%{ write first_final; }%%
8084
raise Mail::Field::IncompleteParseError.new(Mail::ContentTypeElement, data, p)
8185
end

‎lib/mail/parsers/date_time_parser.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# frozen_string_literal: true
32
require "mail/utilities"
43
require "mail/parser_tools"
@@ -715,10 +714,10 @@ def self.parse(data)
715714
_trans = if (_slen > 0 &&
716715
_trans_keys[_keys] <= _wide &&
717716
_wide <= _trans_keys[_keys + 1])
718-
_indicies[_inds + _wide - _trans_keys[_keys]]
719-
else
720-
_indicies[_inds + _slen]
721-
end
717+
_indicies[_inds + _wide - _trans_keys[_keys]]
718+
else
719+
_indicies[_inds + _slen]
720+
end
722721
cs = _trans_targs[_trans]
723722
if _trans_actions[_trans] != 0
724723
case _trans_actions[_trans]
@@ -878,6 +877,10 @@ def self.parse(data)
878877
end
879878
end
880879

880+
if false
881+
testEof
882+
end
883+
881884
if p != eof || cs < 103
882885
raise Mail::Field::IncompleteParseError.new(Mail::DateTimeElement, data, p)
883886
end

‎lib/mail/parsers/date_time_parser.rl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ module Mail::Parsers
5555
%%write init;
5656
%%write exec;
5757

58+
if false
59+
testEof
60+
end
61+
5862
if p != eof || cs < %%{ write first_final; }%%
5963
raise Mail::Field::IncompleteParseError.new(Mail::DateTimeElement, data, p)
6064
end

0 commit comments

Comments
 (0)