HDLRuby 3.8.2 → 3.9.1

data/lib/HDLRuby/hruby_high.rb

@@ -61,8 +61,12 @@ module HDLRuby::High
         include SingletonExtend
 
         # The reserved names
-        RESERVED = [ :user, :initialize, :add_method, :concat_namespace,
-                     :to_namespace, :user?, :user_deep? ]
+        RESERVED = Set.new(
+          [ :user, :initialize, :add_method, :concat_namespace, 
+            :to_namespace, :user?, :user_deep?, 
+
+            :sub, :seq, :par, :hif, :helse, :hcase, :hwhen, :mux, :timed
+          ])
 
         # The construct using the namespace.
         attr_reader :user
@@ -423,6 +427,19 @@ module HDLRuby::High
             return RefObject.new(this,self)
         end
 
+        def [](num,name)
+          name = name.to_sym
+          this = self
+          res = []
+          num.to_i.times do |i|
+            High.top_user.instance_eval do
+              res << send(this.name,HDLRuby.uniq_name(name.to_s + "_#{i}"))
+            end
+          end
+          High.space_reg(name) { res }
+          res
+        end
+
         # Creates and adds a set of inputs typed +type+ from a list of +names+.
         #
         # NOTE: a name can also be a signal, is which case it is duplicated. 
@@ -970,7 +987,7 @@ module HDLRuby::High
         @metacond ||= nil
         @metavalue ||= nil
         match = match ? 1 : 0 if [true,false,nil].include?(match)
-        if match.respond_to?(:to_i) then
+        if @metavalue and match.respond_to?(:to_i) then
           # The hwen can be evaluate straight away. Do metaprograming.
           if @metavalue == match.to_i then
             HDLRuby::High.top_user.sub do
@@ -1391,7 +1408,7 @@ module HDLRuby::High
         #  * the else part is defined through the helse method.
         #  * a behavior is created to enclose the hif.
         def hif(condition, mode = nil, &ruby_block)
-            # return if self.metaif(condition,&ruby_block)
+            return if self.metaif(condition,&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             self.par do
@@ -1406,7 +1423,7 @@ module HDLRuby::High
         #
         # NOTE: added to the hif of the last behavior.
         def helse(mode = nil, &ruby_block)
-            # return if self.metaelse(&ruby_block)
+            return if self.metaelse(&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
@@ -1423,13 +1440,13 @@ module HDLRuby::High
         # with a +condition+ that when met lead
         # to the execution of the block in +mode+ generated by the +ruby_block+.
         def helsif(condition, mode = nil, &ruby_block)
-            # meta = self.metaelsif(condition,&ruby_block) 
-            # if meta == :toif then
-            #   # Must be converted to hif.
-            #   return self.hif(condition,mode, &ruby_block)
-            # elsif meta then
-            #   return
-            # end
+            meta = self.metaelsif(condition,&ruby_block) 
+            if meta == :toif then
+              # Must be converted to hif.
+              return self.hif(condition,mode, &ruby_block)
+            elsif meta then
+              return
+            end
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
@@ -1449,7 +1466,7 @@ module HDLRuby::High
         #  * the when part is defined through the hwhen method.
         #  * a new behavior is created to enclose the hcase.
         def hcase(value)
-            # return if self.metacase(value)
+            return if self.metacase(value)
             self.par do
                 hcase(value)
             end
@@ -1460,7 +1477,7 @@ module HDLRuby::High
         #
         # Can only be used once.
         def hwhen(match, mode = nil, &ruby_block)
-            # return if self.metawhen(match,&ruby_block)
+            return if self.metawhen(match,&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
@@ -2785,7 +2802,7 @@ module HDLRuby::High
             obj = self
             ::HDLRuby::High.cur_block.delete_statement!(obj)
             # Handles the metaprogramming.
-            # return obj if self.metaif(condition,proc { add_statement(obj) })
+            return obj if self.metaif(condition,proc { add_statement(obj) })
             # Creates the if statement.
             stmnt = If.new(condition) { add_statement(obj) }
             # Add it to the current block.
@@ -4099,9 +4116,11 @@ module HDLRuby::High
         # default produces a Transmit or a Connection.
         def to_expr
             # Remove the connection from the system type.
-            High.top_user.delete_connection(self)
+            High.top_user.delete_connection!(self)
+            self.left.no_parent!
+            self.right.no_parent!
             # Generate an expression.
-            return Binary.new(:<=,self.left,self.right)
+            return Binary.new(self.left.type,:<=,self.left,self.right)
         end
 
         # Creates a new behavior sensitive to +event+ including the connection
@@ -4134,10 +4153,10 @@ module HDLRuby::High
         # NOTE: the else part is defined through the helse method.
         def hif(condition)
             # Handles the metaprogramming.
-            # if self.metaif(condition,proc { left <= right }) then
-            #   High.top_user.delete_connection!(self)
-            #   return
-            # end
+            if self.metaif(condition,proc { left <= right }) then
+              High.top_user.delete_connection!(self)
+              return
+            end
 
             # Creates the behavior.
             left, right = self.left, self.right
@@ -4528,7 +4547,7 @@ module HDLRuby::High
         # NOTE: the else part is defined through the helse method.
         # def hif(condition, mode = nil, &ruby_block)
         def hif(condition, mode = self.mode, &ruby_block)
-            # return if self.metaif(condition,&ruby_block)
+            return if self.metaif(condition,&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # Creates the if statement.
@@ -4540,7 +4559,7 @@ module HDLRuby::High
         #
         # Can only be used once.
         def helse(mode = nil, &ruby_block)
-            # return if self.metaelse(&ruby_block)
+            return if self.metaelse(&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
@@ -4557,13 +4576,13 @@ module HDLRuby::High
         # with a +condition+ that when met lead
         # to the execution of the block in +mode+ generated by the +ruby_block+.
         def helsif(condition, mode = nil, &ruby_block)
-            # meta = self.metaelsif(condition,&ruby_block) 
-            # if meta == :toif then
-            #   # Must be converted to hif.
-            #   return self.hif(condition,mode, &ruby_block)
-            # elsif meta then
-            #   return
-            # end
+            meta = self.metaelsif(condition,&ruby_block) 
+            if meta == :toif then
+              # Must be converted to hif.
+              return self.hif(condition,mode, &ruby_block)
+            elsif meta then
+              return
+            end
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
@@ -4584,7 +4603,7 @@ module HDLRuby::High
         #
         # NOTE: the when part is defined through the hwhen method.
         def hcase(value)
-            # return if self.metacase(value)
+            return if self.metacase(value)
             # Creates the case statement.
             self.add_statement(Case.new(value))
         end
@@ -4594,7 +4613,7 @@ module HDLRuby::High
         #
         # Can only be used once.
         def hwhen(match, mode = nil, &ruby_block)
-            # return if self.metawhen(match,&ruby_block)
+            return if self.metawhen(match,&ruby_block)
             # Ensure there is a block.
             ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with

data/lib/HDLRuby/hruby_low2hdr.rb

@@ -133,7 +133,7 @@ module HDLRuby::Low
             # Generate the inners declaration.
             self.each_inner do |inner|
                 res << " " * (level*3)
-                res << inner.type.to_high(level) 
+                res << inner.type.to_hdr(level) 
                 res << ".inner :" << Low2HDR.hdr_decl_name(inner.name) << "\n"
             end
             # Generate the instances.
@@ -331,7 +331,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_hdr(level = 0)
             # Should never be here.
-            raise AnyError, "Internal error: to_high should be implemented in class :#{self.class}"
+            raise AnyError, "Internal error: to_hdr should be implemented in class :#{self.class}"
         end
     end
 
@@ -449,7 +449,7 @@ module HDLRuby::Low
             # The resulting string.
             res = " " * (level*3)
             # Generate the wait.
-            res << "wait " << self.delay.to_hdr(level) << "\n" 
+            res << "!" << self.delay.to_hdr(level) << "\n" 
             # Return the resulting string.
             return res
         end
@@ -465,7 +465,8 @@ module HDLRuby::Low
             # The resulting string.
             res = " " * (level*3)
             # Generate the header.
-            res << "repeat " << self.delay.to_hdr(level) << " do\n"
+            # res << "repeat " << self.delay.to_hdr(level) << " do\n"
+            res << "repeat " << self.number.to_hdr(level) << " do\n"
             # Generate the statement to repeat.
             res << self.statement.to_hdr(level+1)
             # Close the repeat.
@@ -554,7 +555,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_hdr(level = 0)
             # Should never be here.
-            raise AnyError, "Internal error: to_high should be implemented in class :#{self.class}"
+            raise AnyError, "Internal error: to_hdr should be implemented in class :#{self.class}"
         end
     end
 
@@ -566,7 +567,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_hdr(level = 0)
             if self.content.is_a?(HDLRuby::BitString) then
-                return "_#{self.content}"
+                return "_b#{self.content}"
             else
                 return self.content.to_s
             end
@@ -593,7 +594,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_hdr(level = 0)
             # Should never be here.
-            raise AnyError, "Internal error: to_high should be implemented in class :#{self.class}"
+            raise AnyError, "Internal error: to_hdr should be implemented in class :#{self.class}"
         end
     end
 
@@ -672,7 +673,7 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         def to_hdr(level = 0)
             # Should never be here.
-            raise AnyError, "Internal error: to_high should be implemented in class :#{self.class}"
+            raise AnyError, "Internal error: to_hdr should be implemented in class :#{self.class}"
         end
     end
 

data/lib/HDLRuby/hruby_low2vhd.rb

@@ -1100,7 +1100,7 @@ module HDLRuby::Low
             res << "begin\n"
             # Adds the wait.
             res << " " * ((level+1)*3)
-            res << "wait for " << self.delay.to_vhdl(level) << ";\n" 
+            res << "wait for " << self.number.to_vhdl(level) << ";\n" 
             # Generate the remaining of the body.
             res << self.statement.to_vhdl(vars,level+1)
             # Close the process.

data/lib/HDLRuby/std/hruby_enum.rb

@@ -331,14 +331,35 @@ module HDLRuby::High::Std
       if ruby_block then
         # Case when a block is given.
         res = args[0]
-        self.heach do |e|
-          res = res ? ruby_block.call(res,e) : e
+        # HDLRuby special: the argument can also be the type.
+        if res.respond_to?(:to_type) then
+          typ = res.to_type
+          res = nil
+          self.heach do |e|
+            res = res ? ruby_block.call(res,e.as(typ)) : e.as(typ)
+          end
+        else
+          self.heach do |e|
+            res = res ? ruby_block.call(res,e) : e
+          end
         end
       else
         # Case when a symbol is given.
-        sym, res = args[0], args[1]
-        self.heach do |e|
-          res = res ? res.send(sym,e) : e
+        res, sym = args[0], args[1]
+        if res.is_a?(::Symbol) then
+          sym = res
+          res = nil
+        end
+        if res.respond_to?(:to_type) then
+          typ = res.to_type
+          res = nil
+          self.heach do |e|
+            res = res ? res.send(sym,e.as(typ)) : e.as(typ)
+          end
+        else
+          self.heach do |e|
+            res = res ? res.send(sym,e) : e
+          end
         end
       end
       return res

data/lib/HDLRuby/std/sequencer.rb

@@ -947,7 +947,12 @@ module HDLRuby::High::Std
             enum = self.seach
             # Define the computation type: from the initial value if any,
             # otherwise from the enum.
-            typ = init ? init.to_expr.type : enum.type
+            if init.respond_to?(:to_type) then
+              typ = init.to_type
+              init = nil
+            else
+              typ = init ? init.to_expr.type : enum.type
+            end
             # Generate the result signal.
             res  = nil
             HDLRuby::High.cur_system.open do
@@ -2155,7 +2160,9 @@ module HDLRuby::High::Std
 
         # HW times iteration.
         def stimes(&ruby_block)
-            # return (0..self-1).seach(&ruby_block)
+            # Ensures there is a ruby block. This allows to use empty while
+            # statement.
+            ruby_block = proc { } unless ruby_block
             return AnyRange.new(0,self-1).seach(&ruby_block)
         end
 
@@ -2320,6 +2327,9 @@ module HDLRuby::High::Std
 
         # HW times iteration.
         def stimes(&ruby_block)
+            # Ensures there is a ruby block. This allows to use empty while
+            # statement.
+            ruby_block = proc { } unless ruby_block
             return (0..self-1).seach(&ruby_block)
         end