From c25fc2751886278a4e7f30f127e80449160a47f1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 25 Jun 2013 00:07:44 -0400 Subject: v4: general code cleaning, sync with v5 --- lib/sisu/v4/composite.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sisu/v4/composite.rb') diff --git a/lib/sisu/v4/composite.rb b/lib/sisu/v4/composite.rb index f69fe2e4..c2ba1fe1 100644 --- a/lib/sisu/v4/composite.rb +++ b/lib/sisu/v4/composite.rb @@ -164,7 +164,7 @@ module SiSU_Assemble data=@fns_array tuned_file,imagedir=[],[] SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").grey_title_hi unless @opt.cmd =~/q/ - para=data.each do |para| + data.each do |para| if para =~/^<<\s+(\S+?\.ss[it])$/ \ or para =~/^<<\{(\S+?\.ss[it])\}$/ \ or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \ @@ -218,7 +218,7 @@ module SiSU_Assemble begin @opt.fns=@opt.fns.gsub(/\.ssm\.sst$/,'.ssm') #FIX earlier, hub @fns_array=IO.readlines(@opt.fns,'') - files=insertions? + insertions? rescue SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do __LINE__.to_s + ':' + __FILE__ @@ -228,10 +228,10 @@ module SiSU_Assemble end def insertions? data=@fns_array - tuned_file,imagedir=[],[] + tuned_file=[] SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fno).grey_title_hi unless @opt.cmd =~/q/ @ssm=[@opt.fns] - para=data.each do |para| + data.each do |para| if para =~/^<<\s+(\S+?\.ss[it])$/ loadfile=$1.strip SiSU_Screen::Ansi.new(@opt.cmd,'loading:',loadfile).txt_grey if @opt.cmd =~/[MVv]/ -- cgit v1.2.3