HDLRuby 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a13c2fd9d9add1fb436eeca3bd6ce2e58975ab2de842573fe6a260a74e6a901
-  data.tar.gz: 04f16871ee7993c16b2419a691308a7ad235b487406ca9243085bcdcff1db8aa
+  metadata.gz: e8f74ac40d2f3ddc8ec9eb5a17c8d48b091068288a4bdb37adad8008c9b29e78
+  data.tar.gz: '084b85f61816a823c92b736e1d203274f3e1beb2b2278f240bee36218665afe7'
 SHA512:
-  metadata.gz: ff99ac90a5f6bcc09896189f9e77f01e5394446efa8a6687f07d710528973ddf4d5397d5163889c9dc18425805f4a61adc30b56d686a9e6187c7b15a423990b4
-  data.tar.gz: 5cfaa77758b3b15154ebf139fb7bd9f424e41d72c7bd642895dfb6b3929b04f889dba320f4141b55ef554996e28cbd8d5072d7ac7242a395a993cff77d3c2835
+  metadata.gz: ef3418dda3d976fe68beb65a305c6163da94cdecf398ddd9bbc06786abc3c130b8df6ecd3a94064ecc0ffc64105a63838c455bd0709c3f64c83f2e40d7406a2b
+  data.tar.gz: 8c9284a2c34be1f2e39b55cac6419ea858dd4972f9715bf2e39317bdcc4d7fcdcffae4d5c76ff3bbfabd77acd1a295a2cbba651568c569e144900e47814fc072

data/lib/HDLRuby/hruby_low_bool2select.rb

@@ -119,6 +119,17 @@ module HDLRuby::Low
     end
 
 
+    ## Extends the TimeWait class with functionality for converting booleans
+    #  in assignments to select operators.
+    class TimeWait
+        # Converts booleans in assignments to select operators.
+        def boolean_in_assign2select!
+            # Nothing to do.
+            return self
+        end
+    end
+
+
     ## Extends the Block class with functionality for converting booleans
     #  in assignments to select operators.
     class Block

data/lib/HDLRuby/hruby_low_with_var.rb

@@ -247,6 +247,21 @@ module HDLRuby::Low
 
     end
 
+
+    ## Extends the TimeBlock class with separation between signals and variables.
+    class TimeBlock
+        # Converts to a variable-compatible block where +upper+ is
+        # the upper block if any.
+        #
+        # NOTE: the result is a new block.
+        def with_var(upper = nil)
+            # For the specific case of block, the conversion is not
+            # done.
+            return self
+        end
+    end
+
+
     ## Extends the If class with separation between signals and variables.
     class If
         # Converts to a variable-compatible if where +upper+ is

data/lib/HDLRuby/hruby_low_without_select.rb

@@ -96,6 +96,19 @@ module HDLRuby::Low
         end
     end
 
+
+    ## Extends the TimeWait class with functionality for converting booleans
+    #  in assignments to select operators.
+    class TimeWait
+        # Extract the Select expressions.
+        def extract_selects!
+            # Nothing to extract.
+            return []
+        end
+    end
+
+
+
     ## Extends the Block class with functionality for converting select
     #  expressions to case statements.
     class Block

data/lib/HDLRuby/hruby_verilog.rb

@@ -116,7 +116,11 @@ class Block
     # Process top layer of Block.
     # Determine whether there is a block under block and convert it.
     def flatten(mode = nil)
-        new_block  = Block.new(self.mode,"") # A new block to store the converted statement.
+        if self.is_a?(TimeBlock) then
+            new_block = TimeBlock.new(self.mode,"")
+        else
+            new_block  = Block.new(self.mode,"") # A new block to store the converted statement.
+        end
         list = []                            # A list for confirming that variable declarations do not overlap.
 
         # Is block in the statement?
@@ -1884,29 +1888,33 @@ class SystemT
 
         # Translation of behavior part (always).
         self.each_behavior do |behavior|
-            code << "   always @( "
-            # If there is no "always" condition, it is always @("*").
-            if behavior.each_event.to_a.empty? then
-                code << "*"
+            if behavior.block.is_a?(TimeBlock) then
+                code << "   initial begin\n"
             else
-                event = behavior.each_event.to_a
-                event[0..-2].each do |event|
-                    # If "posedge" or "negedge" does not exist, the variable is set to condition.
-                    if (event.type.to_s != "posedge" && event.type.to_s != "negedge") then
-                        code << "#{event.ref.to_verilog}, "
+                code << "   always @( "
+                # If there is no "always" condition, it is always @("*").
+                if behavior.each_event.to_a.empty? then
+                    code << "*"
+                else
+                    event = behavior.each_event.to_a
+                    event[0..-2].each do |event|
+                        # If "posedge" or "negedge" does not exist, the variable is set to condition.
+                        if (event.type.to_s != "posedge" && event.type.to_s != "negedge") then
+                            code << "#{event.ref.to_verilog}, "
+                        else
+                            # Otherwise, it outputs "psoedge" or "negedge" as a condition.
+                            code << "#{event.type.to_s} #{event.ref.to_verilog}, "
+                        end
+                    end
+                    # Since no comma is necessary at the end, we try not to separate commas separately at the end.
+                    if (event.last.type.to_s != "posedge" && event.last.type.to_s != "negedge") then
+                        code << "#{event.last.ref.to_verilog}"
                     else
-                        # Otherwise, it outputs "psoedge" or "negedge" as a condition.
-                        code << "#{event.type.to_s} #{event.ref.to_verilog}, "
+                        code << "#{event.last.type.to_s} #{event.last.ref.to_verilog}"
                     end
                 end
-                # Since no comma is necessary at the end, we try not to separate commas separately at the end.
-                if (event.last.type.to_s != "posedge" && event.last.type.to_s != "negedge") then
-                    code << "#{event.last.ref.to_verilog}"
-                else
-                    code << "#{event.last.type.to_s} #{event.last.ref.to_verilog}"
-                end
+                code << " ) begin\n"
             end
-            code << " ) begin\n"
 
             # Perform "scheduling" using the method "flatten".
             block = behavior.block.flatten(behavior.block.mode.to_s)

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.1.6"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Lovic Gauthier