HDLRuby 3.8.1 → 3.9.0

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