HDLRuby 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b867bb3b74debaa536d2803c7646dd4bb6b1af3b9d6dfee8e2dd321137c05da
-  data.tar.gz: 7c6c21d6f808759241a5789993579fc49dd7acfbea2be645075044528d9d4a25
+  metadata.gz: 45a409a3630e4f26134448f447632f9e4eddb54de95fbae8c1e7594675b7cd8b
+  data.tar.gz: 721ad1ff712c254d78375cfab46383ba88865ba916e58fc76488816f8143caa8
 SHA512:
-  metadata.gz: 663010998dbe51f0123d68e9fc785441e115ee54744f73b36be4bdc8de81103884933222b1a368f5c86809b71118e7b7ebd5e73f2f6e9179547a2971e501c8ef
-  data.tar.gz: 51d7866a4643f05cac41971be813ce43c039949fbbcdb2cfb30280b3fd27d13cbf82a378e4f1151b6b9f1e13d79d4a4a8e4e7172a072cc5e748c8327cc15cd65
+  metadata.gz: d07edc7c5ad0efff6b69050ac4eec19001ac0d2225e2082564591feba3f1ce77ba048dfffb587d58c16e7e2b4b810c9b3345f495d49ff4a0928e842c601550ae
+  data.tar.gz: d5299bf02d8ef3f7d2b0a185152b8a3dbd298b2725bef2365a42a276c7c45b27cf3b900f581bd46a9a35410b853abf412189101d2ad83d4de3cb2cbbf0501c50

data/lib/HDLRuby/hruby_high.rb

@@ -428,6 +428,22 @@ module HDLRuby::High
             return res
         end
 
+
+        # Gets an output signal by +name+ considering also the included
+        # systems
+        def get_output_with_included(name)
+            # Look in self.
+            found = self.get_output(name)
+            return found if found
+            # Not in self, look in the included systems.
+            self.scope.each_included do |included|
+                found = included.get_output_with_included(name)
+                return found if found
+            end
+            # Not found
+            return nil
+        end
+
         # Iterates over the all interface signals, i.e, also the ones of
         # the included systems.
         #
@@ -1919,12 +1935,13 @@ module HDLRuby::High
             else
                 # No, perform a connection is order of declaration
                 connects.each.with_index do |csig,i|
-                    # puts "csig=#{csig} i=#{i}"
+                    # puts "csig=#{csig.name} i=#{i}"
                     # puts "systemT inputs=#{systemT.each_input.to_a.size}"
                     # Gets i-est signal to connect
                     ssig = self.systemT.get_interface_with_included(i)
                     # Check if it is an output.
-                    isout = self.get_output(ssig.name)
+                    isout = self.systemT.get_output_with_included(ssig.name)
+                    # puts "ssig=#{ssig.name} isout=#{isout}"
                     # Convert it to a reference.
                     ssig = RefObject.new(self.to_ref,ssig)
                     # Make the connection.

data/lib/HDLRuby/hruby_low.rb

@@ -2576,11 +2576,25 @@ module HDLRuby::Low
         def block
             if self.is_a?(Block)
                 return self
+            elsif self.parent.is_a?(Scope)
+                # No block
+                return nil
             else
                 return self.parent.block
             end
         end
 
+        # Get the scope of the statement.
+        def scope
+            if self.parent.is_a?(Scope) then
+                return self.parent
+            elsif self.parent.is_a?(Behavior) then
+                return self.parent.parent
+            else
+                return self.parent.scope
+            end
+        end
+
         # Gets the top block, i.e. the first block of the current behavior.
         def top_block
             return self.parent.is_a?(Behavior) ? self : self.parent.top_block
@@ -2588,7 +2602,7 @@ module HDLRuby::Low
 
         # Gets the top scope, i.e. the first scope of the current system.
         def top_scope
-            return self.top_block.parent.top_scope
+            return self.scope.top_scope
         end
     end
 

data/lib/HDLRuby/hruby_low_with_port.rb

@@ -102,6 +102,8 @@ module HDLRuby::Low
             self.each_connection do |connection|
                 connection.each_node_deep do |node|
                     if instance_port?(node) then
+                        # puts "port for node: #{node.ref.name}.#{node.name}"
+                        # puts "leftvalue? #{node.leftvalue?}"
                         refs << node 
                         ref_sym2leftvalue[node.to_sym] = node.leftvalue?
                     end

data/lib/HDLRuby/hruby_low_without_select.rb

@@ -87,9 +87,10 @@ module HDLRuby::Low
                     blk = LowWithoutSelect.selects2block(selects)
                     # Add a transmit replacing the connection.
                     blk.add_statement(
-                        Transmit.new(self.left.clone,self.right.clone))
+                        Transmit.new(connection.left.clone,
+                                     connection.right.clone))
                     # Remove the connection and add a behavior instead.
-                    self.remove_connection(connection)
+                    self.delete_connection!(connection)
                     self.add_behavior(Behavior.new(blk))
                 end
             end
@@ -223,7 +224,14 @@ module HDLRuby::Low
                 selects << [self,sig]
                 # Create the signal replacing self.
                 blk = self.statement.block
-                blk.add_inner(sig)
+                if blk then
+                    # Add the signal in the block.
+                    blk.add_inner(sig)
+                else
+                    # No block, this is a connection, add the signal in the
+                    # socpe
+                    self.statement.scope.add_inner(sig)
+                end
                 # And return a reference to it.
                 return RefName.new(sig.type,RefThis.new,sig.name)
             end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.2.10"
+  VERSION = "2.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler