fhlow 1.91.0 → 1.91.1

data/lib/module_config/items/complexunit.rb

@@ -0,0 +1,53 @@
+require 'complexitem'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexUnitFactory < ItemFactory
+        @@nameregex  = /\w*Unit\w*/
+        @@valueregex = /(\s*.*[;]\s*)*(\s*.*\(.*\)[;]*\s*)?/
+
+        def ComplexUnitFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexUnitFactory.create(_str)
+            ComplexUnit.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+    class ComplexUnit < ComplexItem
+        @@subitemregex = /\A(([\w\/]+,\s*)*[\w\/]+)\s*\((.+)\)\Z/
+
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            
+            tmp = @value
+            @value = []
+            tmp.each do |item| 
+                item.strip!    
+                if item =~ @@subitemregex
+                    item = Hash.new
+                    item["deppath"] = $1
+                    item["archs"] = $3.split(/,\s*/)
+                    item["deppath"] = item["deppath"].split(/,\s*/)
+                    @value.push(item)
+                else
+                    raise ConfigWrongFormatException.new(self.class), "Configuration subitem <#{item}> of item <#{name}> has wrong format."
+                end
+                
+            end
+        end
+
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            @value.each { |v| puts "        #{v["deppath"].join(", ")}(#{v["archs"].join(", ")});" }
+            puts "    }"
+        end
+        
+    end        
+
+end
+

data/lib/module_config/items/simple.rb

@@ -0,0 +1,29 @@
+require 'simpleitem'
+require 'itemfactory'
+
+module Config 
+
+    class SimpleFactory < ItemFactory
+        @@nameregex  = /\w+/
+        @@valueregex = /[\w\-,\/\\:.;\t @]*/
+
+        def SimpleFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+           return $&
+        end
+
+        def SimpleFactory.create(_str)
+            Simple.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+
+        def SimpleFactory.priority
+            10
+        end
+    end
+
+
+    class Simple < SimpleItem
+    end
+
+end
+

data/lib/module_config/items/simplearchitecture.rb

@@ -0,0 +1,34 @@
+require 'itemfactory'
+require 'simpleitem'
+require 'configexception'
+
+module Config 
+
+    class SimpleArchitectureFactory < ItemFactory
+        @@nameregex  = /\w*Architecture[s]?/
+        @@valueregex = /((\s*\w+\s*[,])*\s*\w+)*/
+
+        
+        def SimpleArchitectureFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def SimpleArchitectureFactory.create(_str)
+            SimpleArchitecture.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+
+    class SimpleArchitecture < SimpleItem
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            @value = [] unless @value = @value.split(/,\s*/)
+        end
+    
+        def print
+            puts "    #{@name} = #{@value.join(", ")}\t##{self.class.to_s}"
+        end
+
+    end
+end

data/lib/module_config/items/simplebindir.rb

@@ -0,0 +1,31 @@
+require 'simpleitem'
+require 'itemfactory'
+
+module Config 
+
+    class SimpleBinDirFactory < ItemFactory
+        @@nameregex  = /BinDir/
+        @@valueregex = /[\w.\/\\\- ]*/
+
+        def SimpleBinDirFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+           return $&
+        end
+
+        def SimpleBinDirFactory.create(_str)
+            SimpleBinDir.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+
+    end
+
+
+    class SimpleBinDir < SimpleItem
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            raise ConfigWrongFormatException.new(self.class), "The value of BinDir (#{@value}) is no valid directory!" unless File.directory?(@value) or @value==""
+        end
+
+    end
+
+end
+

data/lib/module_config/items/simplebool.rb

@@ -0,0 +1,24 @@
+require 'itemfactory'
+require 'simpleitem'
+require 'configexception'
+
+module Config 
+
+    class SimpleBoolFactory < ItemFactory
+        @@nameregex  = /SimulateConsole|CompileBuildAll/
+        @@valueregex = /true|false/
+
+        def SimpleBoolFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def SimpleBoolFactory.create(_str)
+            SimpleBool.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+
+    class SimpleBool < SimpleItem
+    end
+end

data/lib/module_config/items/simplepostlayoutsdf.rb

@@ -0,0 +1,24 @@
+require 'itemfactory'
+require 'simpleitem'
+require 'configexception'
+
+module Config 
+
+    class SimpelPostLayoutSimSDFFactory < ItemFactory
+        @@nameregex  = /PostLayoutSimSDF/
+        @@valueregex = /max|min/
+
+        def SimpelPostLayoutSimSDFFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def SimpelPostLayoutSimSDFFactory.create(_str)
+            SimpelPostLayoutSimSDF.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+
+    class SimpelPostLayoutSimSDF < SimpleItem
+    end
+end

data/lib/module_config/items/simplesimulaterun.rb

@@ -0,0 +1,25 @@
+require 'itemfactory'
+require 'simpleitem'
+require 'configexception'
+
+module Config 
+
+    class SimpleSimulateRunFactory < ItemFactory
+        @@nameregex  = /SimulateRun/
+        @@valueregex = /\d+[ ](ms|us|ns|ps)/
+
+        
+        def SimpleSimulateRunFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def SimpleSimulateRunFactory.create(_str)
+            SimpleSimulateRun.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+
+    class SimpleSimulateRun < SimpleItem
+    end
+end

data/lib/module_config/items/simpleverbose.rb

@@ -0,0 +1,33 @@
+require 'itemfactory'
+require 'simpleitem'
+require 'configexception'
+
+module Config 
+
+    class SimpleVerboseFactory < ItemFactory
+        @@nameregex  = /Verbose/
+        @@valueregex = /\d*/
+
+        def SimpleVerboseFactory.match(_str)
+            _str.sub!(SimpleItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def SimpleVerboseFactory.create(_str)
+            SimpleVerbose.new(_str, SimpleItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+
+    class SimpleVerbose < SimpleItem
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            
+            begin
+                @value = Integer(@value)
+            rescue ArgumentError => e
+                raise ConfigWrongFormatException.new(self.class), "Configuration item <#{@name} = #{@value}> has wrong format!"
+            end
+        end
+    end
+end

data/lib/module_config/section.rb

@@ -4,15 +4,16 @@ require 'configexception'
 module Config 
 
     class Section
-        @@beginName = '[\[]'
+        @@beginName = '^\s*[\[]'
         @@name = '[\w\s]+'
-        @@endName = '[\]]'
+        @@endName = '[\]]\s*$'
         @@regex = /#{@@beginName}#{@@name}#{@@endName}[^\[]+/
 
         attr_reader :name
 
 
-        def initialize(_str)
+        def initialize(_str, _filename)
+            @filename = _filename
             @items = []
             str = _str.sub(/#{@@beginName}(#{@@name})#{@@endName}/, '')
             @name = $1
@@ -33,8 +34,19 @@ module Config
             @items.each(&block)
         end
 
+        def item_each(_name, &_block)
+            ifnotfound = lambda { raise Fhlow::FhlowException.new("Config::Section"), "#{@filename}\n        No such item <#{_name}> in section <#{@name}>" }
+            i = @items.detect(ifnotfound) { |item| item.name == _name }
+            i.each(&_block)
+        end
+
+        def getItem(_name)
+            ifnotfound = lambda { raise Fhlow::FhlowException.new("Config::Section"), "#{@filename}\n       No such item <#{_name}> in section <#{@name}>" }
+            @items.detect(ifnotfound) { |item| item.name == _name }
+        end
+
         def [](_name)
-            ifnotfound = lambda { raise Fhlow::FhlowException.new("Config::Section"), "No such section. <#{_name}>" }
+            ifnotfound = lambda { raise Fhlow::FhlowException.new("Config::Section"), "#{@filename}\n       No such item <#{_name}> in section <#{@name}>" }
             i = @items.detect(ifnotfound) { |item| item.name == _name }
             i.value
         end

data/lib/module_config/simpleitem.rb

@@ -0,0 +1,37 @@
+require 'item'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+    
+    class SimpleItem < Item
+        attr_reader :name 
+        attr_reader :value
+    
+        protected
+
+            def initialize(_str, _regex)
+                if _str =~ _regex
+                    @name  = $1
+                    @value = $2
+                else
+                    raise ConfigWrongFormatException.new(self.class), "Configuration item <#{_str}> has wrong format."
+                end
+            end
+        
+        public
+            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
+            end
+
+            def print
+                puts "    #{@name} = #{@value}\t##{self.class.to_s}"
+            end
+
+            def SimpleItem.getRegex(_nameregex, _valueregex)
+                /^\s*(#{_nameregex})\s*=\s*(#{_valueregex})\s*$/
+            end
+    end
+
+end

data/lib/module_config/test.flw

@@ -1,20 +1,41 @@
-[a section]
 
-[another section]
-    ComplexUnits = {
-        1,2;
-        3(bla);
-        4,5,6(bhv)
+
+[Dependencies]
+    Packages = {
+        Prol16, Prol16
+    }
+    
+    Units = {
+        DataPath(Rtl);
+        CoreControl (Rtl)
+    }
+    
+    BhvUnits = {
+        Prol16, memory (beh)
     }
 
-    ComplexPackage = {
-        a,b,c;
-        d,e,f
+    tbUnits = {
     }
 
-    Unit = blablablal(bla)
+    Libraries! = {
+
+    }
 
-    Package = asdfja
-    some = thing else
+[Quartus]
+    BinDir = /bla
 
+[Self]
+    gaga = gaga
+    Architectures = Rtl
+    tbArchitectures = Bhv
+    BhvArchitectures =
 
+
+[Target]
+    Target = SandboxX
+
+
+[fhlow]
+    LeafPrefixes = {
+        unit, pkg, lib
+    }

data/lib/module_config/test.rb

@@ -5,8 +5,9 @@ require 'profile' if $DEBUG
 def show_regexp(a, re)
     if a =~ re
         puts "#{$`}<<#{$&}>>#{$'}"
-        puts "<#{$1}>"
-        puts "<#{$2}>"
+#        puts "1: <#{$1}>"
+#        puts "2: <#{$2}>"
+#        puts "3: <#{$3}>"
     else
         puts "no match"
     end
@@ -75,11 +76,60 @@ a = "ComplexUnits = {\n            1,2,3(bla);\n            4,5,6(bhv)\n
 show_regexp(show_regexp(str, /^\s*(\w+)\s*=\s*([\w,.;\s]+)\s*$/), /^\s*(\w+)\s*=\s*([\w,.;\s]+)\s*$/)
 =end
 
-require 'myconfig'
+=begin
+        oMemAddr[1]     -> PIN_6, false;
+        oMemAddr[2]     -> PIN_7, false;
+        oMemAddr[3]     -> PIN_8, false;
+        oMemAddr[4]     -> PIN_9, false;
+        oMemAddr[5]     -> PIN_10, false;
+        oMemAddr[6]     -> PIN_11, false;
+        oMemAddr[7]     -> PIN_12, false;
+        oMemAddr[8]     -> PIN_13, false;
+        oMemAddr[9]     -> PIN_14, false;
+        oMemAddr[10]    -> PIN_15, false;
+        oMemAddr[11]    -> PIN_16, false;
+        oMemAddr[12]    -> PIN_17, false;
+        oMemAddr[13]    -> PIN_18, false;
+        oMemAddr[14]    -> PIN_19, false;
+        oMemAddr[15]    -> PIN_21, false;
+        oMemData[0]     -> PIN_22, false;
+        oMemData[1]     -> PIN_23, false;
+        oMemData[2]     -> PIN_24, false;
+        oMemData[3]     -> PIN_25, false;
+        oMemData[4]     -> PIN_26, false;
+        oMemData[5]     -> PIN_27, false;
+        oMemData[6]     -> PIN_28, false;
+        oMemData[7]     -> PIN_29, false;
+        oMemData[8]     -> PIN_30, false;
+        oMemData[9]     -> PIN_31, false;
+        oMemData[10]    -> PIN_32, false;
+        oMemData[11]    -> PIN_33, false;
+        oMemData[12]    -> PIN_34, false;
+        oMemData[13]    -> PIN_35, false;
+        oMemData[14]    -> PIN_36, false;
+        oMemData[15]    -> PIN_37, false;
+        onMemCe         -> PIN_38, false;
+        onMemOe         -> PIN_39, false;
+        onMemWe         -> PIN_40, false;
+        oIllegalInst    -> PIN_41, false;
+        oCpuHalt        -> PIN_42, false;
+=end
+
+#show_regexp(a, /^\s*[\[][\w\s]+[\]]\s*$^[^\[]+/ )
+#show_regexp(a, /^\s*[\[][\w\s]+[\]](.*(?=(^\s*[\[][\w\s]+[\]]))|.*)/m )
+
+#a.sub!(/(Pins)\s*=\s*\{((\s*.*[;]\s*)*(\s*.*[;]*\s*)?)\s*\}/, '')
+#puts "<<<<#{$&}>>>>"
+#puts "<<<<#{a}>>>>"
+
+#show_regexp(File.read("test.flw"), /^\s*((?-mix:\w*Architecture[s]?))\s*=\s*((?-mix:((\s*\w+\s*[,])*\s*\w+)*))\s*$/)
+
+require 'config'
 
 begin
-    cfg = Config::Config.new("/home/simon/tmp/fhlow.v2/grpProl16/unitCpu/config.flw")
+    cfg = Config::Config.new("test.flw")
     cfg.print
+#    cfg["TargetSandboxX"].item_each("Pins") { |sig, pin, pull| p sig; p pin; p pull }
 rescue Config::ConfigException => e
     puts "Error:\n#{e.message}"
 end