HDLRuby 2.6.23 → 2.7.5

data/lib/HDLRuby/hruby_low_casts_without_expression.rb

@@ -264,7 +264,7 @@ module HDLRuby::Low
             #                       choice.casts_without_expression
             #                   end )
             self.set_select!(self.select.casts_without_expression!)
-            sef.map_choices! { |choice| choice.casts_without_expression! }
+            self.map_choices! { |choice| choice.casts_without_expression! }
             return self
         end
     end

data/lib/HDLRuby/hruby_low_mutable.rb

@@ -221,6 +221,12 @@ module HDLRuby::Low
             connection
         end
 
+        # Deletes all the connections.
+        def delete_all_conncetions!
+            @connections.each { |cnx| cnx.parent = nil }
+            @connections = []
+        end
+
         # Deletes a behavior.
         def delete_behavior!(behavior)
             if @behaviors.include?(behavior) then
@@ -231,6 +237,12 @@ module HDLRuby::Low
             end
         end
 
+        # Deletes all the behaviors.
+        def delete_all_behaviors!
+            @behaviors.each { |beh| beh.parent = nil }
+            @behaviors = []
+        end
+
         # Deletes the elements related to one of +names+: either they have
         # one of the names or they use an element with these names.
         # NOTE: only delete actual instantiated elements, types or

data/lib/HDLRuby/hruby_low_with_port.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 require "HDLRuby/hruby_error"
 require "HDLRuby/hruby_low_mutable"
 require "HDLRuby/hruby_low2sym"
@@ -88,14 +90,19 @@ module HDLRuby::Low
             # self.each_scope(&:with_port!)
             # Gather the references to instance ports.
             # Also remember if the references were left values or not.
+            # And remember where the node was.
             refs = []
             ref_sym2leftvalue = {}
+            # ref_parents = Set.new
+            ref_parents = []
             self.each_block_deep do |block|
                 block.each_node_deep do |node|
                     if instance_port?(node) then
                         # puts "port for node: #{node.ref.name}.#{node.name}"
                         refs << node 
                         ref_sym2leftvalue[node.to_sym] = node.leftvalue?
+                        ref_parents << node.parent
+                        # ref_parents[node.parent] = node
                     end
                 end
             end
@@ -106,6 +113,8 @@ module HDLRuby::Low
                         # puts "leftvalue? #{node.leftvalue?}"
                         refs << node 
                         ref_sym2leftvalue[node.to_sym] = node.leftvalue?
+                        ref_parents << node.parent
+                        # ref_parents[node.parent] = node
                     end
                 end
             end
@@ -117,17 +126,23 @@ module HDLRuby::Low
             # Replace the references by their corresponding port wires.
             self.each_block_deep do |block|
                 block.each_node_deep do |node|
-                    node.map_nodes! do |expr|
-                        portw = ref_sym2portw[expr.to_sym]
-                        portw ? portw2ref(portw) : expr
+                    if ref_parents.include?(node) then
+                        node.map_nodes! do |expr|
+                            next expr unless instance_port?(expr)
+                            portw = ref_sym2portw[expr.to_sym]
+                            portw ? portw2ref(portw) : expr
+                        end
                     end
                 end
             end
             self.each_connection do |connection|
                 connection.each_node_deep do |node|
-                    node.map_nodes! do |expr|
-                        portw = ref_sym2portw[expr.to_sym]
-                        portw ? portw2ref(portw) : expr
+                    if ref_parents.include?(node) then
+                        node.map_nodes! do |expr|
+                            next expr unless instance_port?(expr)
+                            portw = ref_sym2portw[expr.to_sym]
+                            portw ? portw2ref(portw) : expr
+                        end
                     end
                 end
             end

data/lib/HDLRuby/hruby_low_without_namespace.rb

@@ -133,7 +133,8 @@ module HDLRuby::Low
             # Get the behaviors.
             behs = self.each_behavior.to_a
             # Remove them from the scope.
-            behs.each { |beh| self.delete_behavior!(beh) }
+            # behs.each { |beh| self.delete_behavior!(beh) }
+            self.delete_all_behaviors!
             # Return the behaviors.
             return behs
         end
@@ -145,7 +146,8 @@ module HDLRuby::Low
             # Get the connections.
             cnxs = self.each_connection.to_a
             # Remove them from the scope.
-            cnxs.each { |beh| self.delete_connection!(beh) }
+            # cnxs.each { |cnx| self.delete_connection!(cnx) }
+            cnxs.delete_all_connections!
             # Return the connections.
             return cnxs
         end

data/lib/HDLRuby/hruby_tools.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module HDLRuby
 
 ##
@@ -11,16 +13,21 @@ module HDLRuby
 
     @@absoluteCounter = -1 # The absolute name counter.
 
+    @@uniq_names = Set.new(Symbol.all_symbols.map {|sym| sym.to_s})
+
     # Generates an absolute uniq name.
     def self.uniq_name(base = "")
         @@absoluteCounter += 1
         name = base.to_s + ":#{@@absoluteCounter}"
-        if Symbol.all_symbols.find {|symbol| symbol.to_s == name } then
+        # if Symbol.all_symbols.find {|symbol| symbol.to_s == name } then
+        if @@uniq_names.include?(name) then
             # The symbol exists, try again.
             return self.uniq_name
         else
+            @@uniq_names.add(name)
             return name.to_sym
         end
+        # return base.to_s + ":#{@@absoluteCounter}"
     end