fhlow 1.91.0

data/lib/module_config/configitems/simplepackage.rb

@@ -0,0 +1,47 @@
+require 'item'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class SimplePackageFactory < ItemFactory
+        def SimplePackageFactory.match(_str)
+            _str.sub!(SimplePackage.getRegex, '')
+            return $&
+        end
+
+        def SimplePackageFactory.create(*_args)
+            SimplePackage.new(*_args)
+        end
+    end
+
+
+    class SimplePackage < Item
+        @@regex = /^\s*(\w*Package\w*)\s*=\s*([\w,.;\s]+)\s*$/
+
+        attr_reader :name 
+        attr_reader :value
+
+        def initialize(_str)
+            if _str =~ @@regex
+                @name = $1
+                @value = $2.strip
+            else
+                raise ConfigWrongFormatException.new(self.class), "Configuration item <#{_str}> has wrong format."
+            end
+        end
+    
+        def merge(_item)
+            raise ConfigMergeException.new(self.class), "Merge: Configuration items do not fit! <#{_item}> is not of type #{self.class.to_s}." unless _item.instance_of?(self.class)
+            raise ConfigMergeException.new(self.class), "Merge: Configuration items do not have the same name! <#{_item.name}> vs. <#{@name}>" unless _item.name == @name
+            
+            @value = _item.value
+        end
+
+        def SimplePackage.getRegex()
+            @@regex
+        end
+
+    end
+
+end

data/lib/module_config/configitems/simpleunit.rb

@@ -0,0 +1,53 @@
+require 'item'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class SimpleUnitFactory < ItemFactory
+        def SimpleUnitFactory.match(_str)
+            _str.sub!(SimpleUnit.getRegex, '')
+            return $&
+        end
+
+        def SimpleUnitFactory.create(*_args)
+            SimpleUnit.new(*_args)
+        end
+    end
+
+
+    class SimpleUnit < Item
+        @@regex = /^\s*(\w*Unit\w*)\s*=\s*([\w,.;\s]+)\((.*)\)\s*$/
+
+        attr_reader :name 
+        attr_reader :value
+
+        def initialize(_str)
+            if _str =~ @@regex
+                @name = $1
+                @value = Hash.new
+                @value["deppath"] = $2
+                @value["archs"] = $3.split(/,\s*/)
+            else
+                raise ConfigWrongFormatException.new(self.class), "Configuration item <#{_str}> has wrong format."
+            end
+        end
+    
+        def merge(_item)
+            raise ConfigMergeException.new(self.class), "Merge: Configuration items do not fit! <#{_item}> is not of type #{self.class.to_s}." unless _item.instance_of?(self.class)
+            raise ConfigMergeException.new(self.class), "Merge: Configuration items do not have the same name! <#{_item.name}> vs. <#{@name}>" unless _item.name == @name
+            
+            @value = _item.value
+        end
+
+        def print
+            puts "<#{self.class.to_s}> -> ".ljust(40)+"    #{@name} = #{@value["deppath"]}(#{@value["archs"].join(", ")})"
+        end
+
+        def SimpleUnit.getRegex()
+            @@regex
+        end
+
+    end
+
+end

data/lib/module_config/configs.test

@@ -0,0 +1,24 @@
+[Section]
+    Simple = Value
+    Simple1 = Value1
+
+    Complex = {
+        Value2;
+        V, a, l, u, e
+        v
+    }
+
+[AnotherSection]
+    S = V
+    S1 = V1
+    
+    C = {
+        v
+    }
+
+    C = {
+        V2;
+        V, v, 2;
+        v
+    }
+

data/lib/module_config/item.rb

@@ -0,0 +1,34 @@
+module Config 
+
+    class Item
+        attr_reader :priority
+        
+        protected
+            def initialize
+            end
+
+        public
+
+            def print
+                puts "<#{self.class.to_s}> -> ".ljust(40)+"    #{@name} = #{@value}"
+            end
+
+            def merge(_item)
+                raise NotImplementedError, "You have to implement merge() in sublcasses inherited from Config::Item!"
+            end
+
+            def name
+                raise NotImplementedError, "You have to implement name() in sublcasses inherited from Config::Item!"
+            end
+
+            def value
+                raise NotImplementedError, "You have to implement value() in sublcasses inherited from Config::Item!"
+            end
+
+            def Item.getRegex()
+                raise NotImplementedError, "You have to implement getRegex() in sublcasses inherited from Config::Item!"
+            end
+        
+    end 
+
+end

data/lib/module_config/itemfactory.rb

@@ -0,0 +1,55 @@
+require "configexception"
+
+module Config 
+
+    class ItemFactory
+        
+        @@factories = []
+
+        def ItemFactory.inherited(_if)
+            @@factories.push(_if)
+        end
+
+
+        def ItemFactory.factories()
+            @@factories
+        end
+
+
+        def ItemFactory.getItemFor(_str)
+            @@factories.each do |subclass|
+                match = subclass.match(_str)    # the matched string will be removed from _str by subclass.match()
+                if !match.nil?
+                    return subclass.create(match)
+                end
+            end
+
+            raise ConfigException.new(self.class), "There were some wrong entries in your configfile:\n -----\n #{_str.strip}\n -----" 
+        end
+
+
+        def ItemFactory.load(_dir)
+            Dir.open(_dir).each do |file|
+                if file =~ /[.]rb$/
+                    require _dir+"/"+file
+                end
+            end
+            @@factories.sort! { |x,y| x.priority <=> y.priority }
+        end
+
+        def ItemFactory.match(_str)
+            raise NotImplementedError, "You have to implement match() in sublcasses inherited from Config::ItemFactory!"
+        end
+
+
+        def ItemFactory.create()
+            raise NotImplementedError, "You have to implement create() in sublcasses inherited from Config::ItemFactory!"
+        end
+    
+        def ItemFactory.priority()
+            0
+        end
+    
+    end
+
+end

data/lib/module_config/section.rb

@@ -0,0 +1,69 @@
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class Section
+        @@beginName = '[\[]'
+        @@name = '[\w\s]+'
+        @@endName = '[\]]'
+        @@regex = /#{@@beginName}#{@@name}#{@@endName}[^\[]+/
+
+        attr_reader :name
+
+
+        def initialize(_str)
+            @items = []
+            str = _str.sub(/#{@@beginName}(#{@@name})#{@@endName}/, '')
+            @name = $1
+
+
+            while !str.strip.empty?
+                begin 
+                    @items.push(ItemFactory.getItemFor(str))    # the matched string will be deleted from str by ItemFactory.getItemFor()
+
+                rescue ConfigException => e
+                    raise ConfigException.new(self.class), "  Section: #{@name}\n  Error:   #{e.message}"
+                end
+            end
+
+        end
+
+        def each(&block)
+            @items.each(&block)
+        end
+
+        def [](_name)
+            ifnotfound = lambda { raise Fhlow::FhlowException.new("Config::Section"), "No such section. <#{_name}>" }
+            i = @items.detect(ifnotfound) { |item| item.name == _name }
+            i.value
+        end
+
+        def merge(_section)
+            begin
+                _section.each do |arg_item|
+                    if i = @items.detect { |item| item.name == arg_item.name }
+                        i.merge(arg_item)
+                    else
+                        @items.push(arg_item)
+                    end
+                end
+            
+            rescue ConfigException => e
+                raise ConfigException.new(self.class), "  Section: #{@name}\n  Error:   #{e.message}"
+                
+            end
+        end
+
+        def print()
+            puts "[#{@name}]"
+            @items.each { |i| i.print() }
+        end
+
+        def Section.getRegex()
+            @@regex
+        end
+
+    end
+
+end

data/lib/module_config/test.flw

@@ -0,0 +1,20 @@
+[a section]
+
+[another section]
+    ComplexUnits = {
+        1,2;
+        3(bla);
+        4,5,6(bhv)
+    }
+
+    ComplexPackage = {
+        a,b,c;
+        d,e,f
+    }
+
+    Unit = blablablal(bla)
+
+    Package = asdfja
+    some = thing else
+
+

data/lib/module_config/test.rb

@@ -0,0 +1,85 @@
+$:.unshift("../module_fhlow")
+
+require 'profile' if $DEBUG
+
+def show_regexp(a, re)
+    if a =~ re
+        puts "#{$`}<<#{$&}>>#{$'}"
+        puts "<#{$1}>"
+        puts "<#{$2}>"
+    else
+        puts "no match"
+    end
+end 
+
+
+def dummy(_str)
+    _str.sub!("h", 'H')
+end
+
+=begin
+str = "hallo"
+dummy(str)
+puts str
+
+
+
+a = IO.read("configs.test")
+puts a
+=end
+
+=begin
+
+puts "---------------------------------------------"
+#show_regexp(a, /^\s*.*[;]*/)
+#show_regexp(a, /(\w+)\s*=(\s*|[\n]*)\{((\s*.*[;][\s\n]*)+(\s*.*[;]*[\s\n]*))\}/)
+#show_regexp(a, /(\w+)\s*=(\s*|[\n]*)\{((\s*.*[;][\s\n]*)*(\s*.*[;]*[\s\n]*))\}/)
+a = "\n    \n    gaga = hallo\n    \n    \n\n   \n\n\n\n\n"
+a = "\n    Architectures = Rtl, SomeArch\n    tbArchitectures = Bhv, SomeTbArch\n    bhvArchitectures = Bhv, SomeBhvArch\n\n"
+a = "UnitComplex = { 1,2,3(bla); \n \n 11, 12, 13(blub) } \n\n Unit = 21,22,23(glob) \n\n PackageComplex = { a,b,c; \n c,d,e } \n Package = f,g,h \n"
+
+p IO.read("/home/simon/tmp/fhlow.v2/grpProl16/unitAlu/config.flw")
+
+a = "Packages = {\n        Prol16, Prol16;\n    }\n\n    Units = {\n    }\n\n    BhvUnits = {      \n    }\n\n    tbUnits = {\n        Prol16, Alu,(Bhv)\n    }\n"
+#show_regexp(a, /(\w*Unit\w*)\s*=\s*\{((\s*.*[;]\s*)*(\s*.*\(.*\)[;]*\s*)?)*\}/)
+show_regexp(a, /(\w*Unit\w*)\s*=\s*\{((\s*.*[;]\s*)*(\s*.*\(.*\)[;]*\s*)?)\s*\}/)
+
+=end
+
+=begin
+show_regexp(a, /(\w+)\s*=(\s*|[\n]*)\{((\s*.*[;][\s\n]*)*(\s*.*\(.*\)[;]*[\s\n]*))\}/)
+puts "-------------------"
+show_regexp(a, /(\w+)\s*=(\s*|[\n]*)\{((\s*[^\(\)]*[;][\s\n]*)*(\s*[^\(\)]*[;]*[\s\n]*))\}/)
+puts "-------------------"
+show_regexp(a, /^\s*(\w+)\s*=\s*([\w,.;\s\(\)]+)\s*$/)
+puts "-------------------"
+show_regexp(a, /^\s*(\w+)\s*=\s*([\w,.;\s]+)\s$/)
+puts "-------------------"
+
+a = "ComplexUnits = {\n            1,2,3(bla);\n            4,5,6(bhv)\n        }\n\n        ComplexPackage = {\n            a,b,c;\n            d,e,f\n        }\n\n        Unit = blablablal(bla)\n\n        Package = asdfja\n        some = thing else"
+        str = 'ComplexUnits = {
+            1,2,3(bla);
+            4,5,6(bhv)
+        }
+
+        ComplexPackage = {
+            a,b,c;
+            d,e,f
+        }
+
+        Unit = blablablal(bla)
+
+        Package = asdfja
+        some = thing else'
+
+show_regexp(show_regexp(str, /^\s*(\w+)\s*=\s*([\w,.;\s]+)\s*$/), /^\s*(\w+)\s*=\s*([\w,.;\s]+)\s*$/)
+=end
+
+require 'myconfig'
+
+begin
+    cfg = Config::Config.new("/home/simon/tmp/fhlow.v2/grpProl16/unitCpu/config.flw")
+    cfg.print
+rescue Config::ConfigException => e
+    puts "Error:\n#{e.message}"
+end

data/lib/module_config/tmp

@@ -0,0 +1,3 @@
+Hallo
+configitems/complex.rb
+configitems/simple.rb

data/lib/module_config/unittests/config_1.flw

@@ -0,0 +1,14 @@
+[ep]
+    alias = yate
+    ep = true
+    gkclient = false
+    ident = yate
+    
+[gk]
+    interface1 = 203.152.135.66
+    interface1 = 203.152.135.66
+    server = false
+    
+[incoming]
+    called = 8989989
+    context = default

data/lib/module_config/unittests/config_1_fixed.flw

@@ -0,0 +1,14 @@
+[ep]
+    alias = yate
+    ep = true
+    gkclient = false
+    ident = yate
+    
+[gk]
+#    interface1 = 203.152.135.66
+#    interface1 = 203.152.135.66
+    server = false
+    
+[incoming]
+    called = 8989989
+    context = default

data/lib/module_config/unittests/config_2.flw

@@ -0,0 +1,15 @@
+#comment
+
+[dependencies]
+    foo = hallo
+    
+    units = {
+        Test, Wiese, Bauern; 
+        blume, handy, hiphop
+    }
+
+   
+    test = {
+        a, test, gogogo
+    }
+