From da4985ca4b435a19081e8b481b622a865d1fbb03 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 21 Nov 2014 19:37:01 -0500
Subject: d: ao, rearrange, introduce new file

---
 lib/sisu/develop/ao.rb | 99 +++++++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

(limited to 'lib/sisu/develop/ao.rb')

diff --git a/lib/sisu/develop/ao.rb b/lib/sisu/develop/ao.rb
index e3e4703b..585192b0 100644
--- a/lib/sisu/develop/ao.rb
+++ b/lib/sisu/develop/ao.rb
@@ -73,6 +73,7 @@ module SiSU_AO
   require_relative 'ao_character_check'                 # ao_character_check.rb
   require_relative 'ao_misc_arrange'                    # ao_misc_arrange.rb
   require_relative 'ao_expand_insertions'               # ao_expand_insertions.rb
+  require_relative 'ao_persist'                         # ao_persist.rb
   require_relative 'prog_text_translation'              # prog_text_translation.rb
   require_relative 'shared_sem'                         # shared_sem.rb
   class Instantiate < SiSU_Param::Parameters::Instructions
@@ -82,13 +83,10 @@ module SiSU_AO
     end
   end
   class Source <Instantiate
-    @@ao_array=[]
-    @@idx_arr={ sst: [], tex: [], html: [], xhtml: [] }
-    @@map_arr={ nametags: [], ocn_htmlseg: [] }
-    @@fns=nil
     def initialize(opt,fnx=nil)
       @opt,@fnx=opt,fnx
-      @@fns ||=opt.fns
+      @per ||=SiSU_AO_Persist::Persist.new.persist_init
+      @per.fns ||=opt.fns
       fn_use=if fnx \
       and fnx =~/\.ss[tmi]$/
         fnx
@@ -110,13 +108,14 @@ module SiSU_AO
     end
     def read                                                                   #creates ao
       begin
-        @@ao_array=[]
-        @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        @per=SiSU_AO_Persist::Persist.new
+        @per.ao_arr=[]
+        @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
         ? @fnx
         : @opt.fns
         create_ao
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@@fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@per.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -126,16 +125,16 @@ module SiSU_AO
     def get                                                                    #reads ao, unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@ao_array=[]
+          @per.ao_arr=[]
         end
-        ao=(@@ao_array.empty?) \
+        ao=(@per.ao_arr.empty?) \
         ? read_fnc
-        : @@ao_array.dup
+        : @per.ao_arr.dup
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -147,16 +146,16 @@ module SiSU_AO
     def get_idx_sst                                                            #reads ao idx.sst, #unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@idx_arr[:sst]=[]
+          @per.idx_arr_sst=[]
         end
-        ao=(@@idx_arr[:sst].empty?) \
+        ao=(@per.idx_arr_sst.empty?) \
         ? read_idx_sst
-        : @@idx_arr[:sst].dup #check
+        : @per.idx_arr_sst.dup #check
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -168,16 +167,16 @@ module SiSU_AO
     def get_idx_raw
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@idx_arr[:tex]=[]
+          @per.idx_arr_tex=[]
         end
-        ao=(@@idx_arr[:tex].empty?) \
+        ao=(@per.idx_arr_tex.empty?) \
         ? read_idx_raw
-        : @@idx_arr[:tex].dup #check
+        : @per.idx_arr_tex.dup #check
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -189,16 +188,16 @@ module SiSU_AO
     def get_idx_html                                                           #reads ao idx.html, #unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@idx_arr[:html]=[]
+          @per.idx_arr_html=[]
         end
-        ao=(@@idx_arr[:html].empty?) \
+        ao=(@per.idx_arr_html.empty?) \
         ? read_idx_html
-        : @@idx_arr[:html].dup
+        : @per.idx_arr_html.dup
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -210,16 +209,16 @@ module SiSU_AO
     def get_idx_xhtml                                                          #reads ao idx.xhtml, #unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@idx_arr[:xthml]=[]
+          @per.idx_arr_xhtml=[] #...
         end
-        ao=(@@idx_arr[:xhtml].empty?) \
+        ao=(@per.idx_arr_xhtml.empty?) \
         ? read_idx_xhtml
-        : @@idx_arr[:xhtml].dup
+        : @per.idx_arr_xhtml.dup
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -231,16 +230,16 @@ module SiSU_AO
     def get_map_nametags                                                       #reads ao map.nametags, #unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@map_arr[:nametags]=[]
+          @per.map_arr_nametags=[]
         end
-        ao=(@@map_arr[:nametags].empty?) \
+        ao=(@per.map_arr_nametags.empty?) \
         ? read_map_nametags
-        : @@map_arr[:nametags].dup
+        : @per.map_arr_nametags.dup
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
@@ -252,16 +251,16 @@ module SiSU_AO
     def get_map_ocn_htmlseg                                                    #reads ao map.ocn_htmlseg, #unless does not exist then creates first
       begin
         ao=[]
-        unless @@fns==@opt.fns \
-        or @@fns==@fnx
-          @@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
+        unless @per.fns==@opt.fns \
+        or @per.fns==@fnx
+          @per.fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
           ? @fnx
           : @opt.fns
-          @@map_arr[:ocn_htmlseg]=[]
+          @per.map_arr_ocn_htmlseg=[]
         end
-        ao=(@@map_arr[:ocn_htmlseg].empty?) \
+        ao=(@per.map_arr_ocn_htmlseg.empty?) \
         ? read_map_ocn_htmlseg
-        : @@map_arr[:ocn_htmlseg].dup
+        : @per.map_arr_ocn_htmlseg.dup
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
-- 
cgit v1.2.3