HDLRuby 2.9.0 → 2.10.5

data/lib/HDLRuby/hruby_high.rb

@@ -38,7 +38,7 @@ module HDLRuby::High
             # puts "eigen_extend for #{self} class=#{self.class}"
             obj.singleton_methods.each do |name|
                 next if name == :yaml_tag # Do not know why we need to skip
-                # puts "name=#{name}"
+                puts "name=#{name}"
                 self.define_singleton_method(name, &obj.singleton_method(name))
             end
         end
@@ -87,10 +87,11 @@ module HDLRuby::High
                     raise AnyError, 
                           "Resevered name #{name} cannot be overridden."
                 end
-                if self.respond_to?(name) then
-                    raise AnyError,
-                          "Symbol #{name} is already defined."
-                end
+                # Deactivated: overriding is now accepted.
+                # if self.respond_to?(name) then
+                #     raise AnyError,
+                #           "Symbol #{name} is already defined."
+                # end
                 define_singleton_method(name,&ruby_block) 
             end
         end
@@ -441,9 +442,9 @@ module HDLRuby::High
                     res = self.add_output(SignalI.new(name,type,:output))
                 elsif name.is_a?(Hash) then
                     # Names associated with values.
-                    names.each do |name,value|
-                        res = self.add_inner(
-                            SignalI.new(name,type,:inner,value))
+                    name.each do |key,value|
+                        res = self.add_output(
+                            SignalI.new(key,type,:output,value))
                     end
                 else
                     raise AnyError, "Invalid class for a name: #{name.class}"
@@ -474,6 +475,21 @@ module HDLRuby::High
         end
 
 
+        # Gets an input signal by +name+ considering also the included
+        # systems
+        def get_input_with_included(name)
+            # Look in self.
+            found = self.get_input(name)
+            return found if found
+            # Not in self, look in the included systems.
+            self.scope.each_included do |included|
+                found = included.get_input_with_included(name)
+                return found if found
+            end
+            # Not found
+            return nil
+        end
+
         # Gets an output signal by +name+ considering also the included
         # systems
         def get_output_with_included(name)
@@ -489,6 +505,36 @@ module HDLRuby::High
             return nil
         end
 
+        # Gets an inout signal by +name+ considering also the included
+        # systems
+        def get_inout_with_included(name)
+            # Look in self.
+            found = self.get_inout(name)
+            return found if found
+            # Not in self, look in the included systems.
+            self.scope.each_included do |included|
+                found = included.get_inout_with_included(name)
+                return found if found
+            end
+            # Not found
+            return nil
+        end
+
+        # Iterates over the all signals (input, output, inout, inner, constant),
+        # i.e, also the ones of the included systems.
+        #
+        # Returns an enumerator if no ruby block is given.
+        def each_signal_all_with_included(&ruby_block)
+            # No ruby block? Return an enumerator.
+            return to_enum(:each_signal_all_with_included) unless ruby_block
+            # Iterate on all the signals of the current system.
+            self.each_signal_all(&ruby_block)
+            # Recurse on the included systems.
+            self.scope.each_included do |included|
+                included.each_signal_all_with_included(&ruby_block)
+            end
+        end
+
         # Iterates over the all interface signals, i.e, also the ones of
         # the included systems.
         #
@@ -496,7 +542,7 @@ module HDLRuby::High
         def each_signal_with_included(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each_signal_with_included) unless ruby_block
-            # Iterate on the signals of the current system.
+            # Iterate on all the signals of the current system.
             self.each_signal(&ruby_block)
             # Recurse on the included systems.
             self.scope.each_included do |included|
@@ -510,6 +556,14 @@ module HDLRuby::High
             return each_signal_with_included.to_a[i]
         end
 
+        # Gets a signal by +name+ considering also the included
+        # systems
+        def get_signal_with_included(name)
+            return get_input_with_included(name) ||
+                   get_output_with_included(name) ||
+                   get_inout_with_included(name)
+        end
+
         # Iterates over the exported constructs
         #
         # NOTE: look into the scope.
@@ -616,7 +670,6 @@ module HDLRuby::High
             # Fill the public namespace
             space = self.public_namespace
             # Interface signals
-            # puts "i_name=#{i_name} @to_includes=#{@to_includes.size}"
             self.each_signal do |signal|
                 # puts "signal=#{signal.name}"
                 space.send(:define_singleton_method,signal.name) do
@@ -869,7 +922,8 @@ module HDLRuby::High
             # Initialize the set of exported inner signals and instances
             @exports = {}
             # Initialize the set of included systems.
-            @includes = {}
+            # @includes = {}
+            @includes = []
 
             # Builds the scope if a ruby block is provided.
             self.build(&ruby_block) if block_given?
@@ -956,7 +1010,8 @@ module HDLRuby::High
             # No ruby block? Return an enumerator.
             return to_enum(:each_included) unless ruby_block
             # A block? Apply it on each included system.
-            @includes.each_value(&ruby_block)
+            # @includes.each_value(&ruby_block)
+            @includes.each(&ruby_block)
             # And apply on the sub scopes if any.
             @scopes.each {|scope| scope.each_included(&ruby_block) }
         end
@@ -1126,6 +1181,8 @@ module HDLRuby::High
 
         # Declares a sub scope with possible +name+ and built from +ruby_block+.
         def sub(name = :"", &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Creates the new scope.
             # scope = Scope.new(name,&ruby_block)
             scope = Scope.new(name)
@@ -1142,6 +1199,8 @@ module HDLRuby::High
         # Declares a high-level sequential behavior activated on a list of
         # +events+, and built by executing +ruby_block+.
         def seq(*events, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Preprocess the events.
             events.map! do |event|
                 event.respond_to?(:to_event) ? event.to_event : event
@@ -1153,6 +1212,8 @@ module HDLRuby::High
         # Declares a high-level parallel behavior activated on a list of
         # +events+, and built by executing +ruby_block+.
         def par(*events, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Preprocess the events.
             events.map! do |event|
                 event.respond_to?(:to_event) ? event.to_event : event
@@ -1164,6 +1225,8 @@ module HDLRuby::High
         # Declares a high-level timed behavior built by executing +ruby_block+.
         # By default, timed behavior are sequential.
         def timed(&ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Create and add the resulting behavior.
             self.add_behavior(TimeBehavior.new(:seq,&ruby_block))
         end
@@ -1177,6 +1240,8 @@ 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)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             self.par do
                 hif(condition,mode,&ruby_block)
             end
@@ -1189,6 +1254,8 @@ module HDLRuby::High
         #
         # NOTE: added to the hif of the last behavior.
         def helse(mode = nil, &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
             # the last statement of the last behavior.
             statement = self.last_behavior.last_statement
@@ -1203,6 +1270,8 @@ 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)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
             # the last statement of the last behavior.
             statement = self.last_behavior.last_statement
@@ -1230,6 +1299,8 @@ module HDLRuby::High
         #
         # Can only be used once.
         def hwhen(match, mode = nil, &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
             # the last statement of the last behavior.
             statement = @behaviors.last.last_statement
@@ -1249,13 +1320,16 @@ module HDLRuby::High
         # Include a +system+ type with possible +args+ instanciation
         # arguments.
         def include(system,*args)
-            if @includes.key?(system.name) then
-                raise AnyError, "Cannot include twice the same system."
+            # if @includes.key?(system.name) then
+            #     raise AnyError, "Cannot include twice the same system: #{system}"
+            # end
+            if @includes.include?(system) then
+                raise AnyError, "Cannot include twice the same system: #{system}"
             end
-            # puts "Include system=#{system.name}"
-            # Save the name of the included system, it will serve as key
-            # for looking for the included expanded version.
-            include_name = system.name
+            # # puts "Include system=#{system.name}"
+            # # Save the name of the included system, it will serve as key
+            # # for looking for the included expanded version.
+            # include_name = system.name
             # Expand the system to include
             system = system.expand(:"",*args)
             # Add the included system interface to the current one.
@@ -1263,7 +1337,8 @@ module HDLRuby::High
                 space = self.namespace
                 # Interface signals
                 # puts "i_name=#{i_name} @to_includes=#{@to_includes.size}"
-                system.each_signal_with_included do |signal|
+                # system.each_signal_with_included do |signal|
+                system.each_signal_all_with_included do |signal|
                     # puts "signal=#{signal.name}"
                     space.send(:define_singleton_method,signal.name) do
                         signal
@@ -1282,18 +1357,20 @@ module HDLRuby::High
                 end
             end
             # Adds it the list of includeds
-            @includes[include_name] = system
+            # @includes[include_name] = system
+            @includes << system
+
             # puts "@includes=#{@includes}"
             
         end
 
-        # Casts as an included +system+.
-        def as(system)
-            # puts "as with name: #{system.name}"
-            system = system.name if system.respond_to?(:name)
-            # puts "includes are: #{@includes.keys}"
-            return @includes[system].namespace
-        end
+        # Obsolete
+        # # Casts as an included +system+.
+        # def as(system)
+        #     # puts "as with name: #{system.name}"
+        #     system = system.name if system.respond_to?(:name)
+        #     return @includes[system].namespace
+        # end
 
 
         # Gets the current system.
@@ -1308,7 +1385,8 @@ module HDLRuby::High
         # NOTE: name conflicts are treated in the current NameStack state.
         def fill_low(scopeL)
             # Adds the content of its included systems.
-            @includes.each_value {|system| system.scope.fill_low(scopeL) }
+            # @includes.each_value {|system| system.scope.fill_low(scopeL) }
+            @includes.each {|system| system.scope.fill_low(scopeL) }
             # Adds the declared local system types.
             # NOTE: in the current version of HDLRuby::High, there should not
             # be any of them (only eigen systems are real system types).
@@ -1545,6 +1623,8 @@ module HDLRuby::High
 
         # Redefinition of +operator+.
         def define_operator(operator,&ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Register the operator as overloaded.
             @overloads ||= {}
             @overloads[operator] = ruby_block
@@ -1941,6 +2021,8 @@ module HDLRuby::High
     # Declares a high-level generic type named +name+, and using +ruby_block+
     # for construction.
     def typedef(name, &ruby_block)
+        # Ensure there is a block.
+        ruby_block = proc {} unless block_given?
         type = TypeGen.new(name,&ruby_block)
         if HDLRuby::High.in_system? then
             # Must be inside a scope.
@@ -1976,6 +2058,8 @@ module HDLRuby::High
     # Declares a high-level system type named +name+, with +includes+ mixins
     # system types and using +ruby_block+ for instantiating.
     def system(name = :"", *includes, &ruby_block)
+        # Ensure there is a block.
+        ruby_block = proc {} unless block_given?
         # print "system ruby_block=#{ruby_block}\n"
         # Creates the resulting system.
         return SystemT.new(name,*includes,&ruby_block)
@@ -1987,6 +2071,8 @@ module HDLRuby::High
     # NOTE: this is for generating directly an instance without declaring
     #       it system type.
     def instance(name, *includes, &ruby_block)
+        # Ensure there is a block.
+        ruby_block = proc {} unless block_given?
         # Creates the system type.
         systemT = system(:"",*includes,&ruby_block)
         # Instantiate it with +name+.
@@ -1999,6 +2085,8 @@ module HDLRuby::High
     #
     # NOTE: a function is a short-cut for a method that creates a scope.
     def function(name, &ruby_block)
+        # Ensure there is a block.
+        ruby_block = proc {} unless block_given?
         if HDLRuby::High.in_system? then
             define_singleton_method(name.to_sym) do |*args,&other_block|
                 # sub do
@@ -2074,26 +2162,28 @@ module HDLRuby::High
                 # Performs the connections.
                 connects.each do |key,value|
                     # Gets the signal corresponding to connect.
-                    signal = self.get_signal(key)
-                    unless signal then
-                        # Look into the included systems.
-                        self.systemT.scope.each_included do |included|
-                            signal = included.get_signal(key)
-                            break if signal
-                        end
-                    end
+                    # signal = self.get_signal(key)
+                    # unless signal then
+                    #     # Look into the included systems.
+                    #     self.systemT.scope.each_included do |included|
+                    #         signal = included.get_signal(key)
+                    #         break if signal
+                    #     end
+                    # end
+                    signal = self.systemT.get_signal_with_included(key)
                     # Check if it is an output.
-                    isout = self.get_output(key)
-                    unless isout then
-                        # Look into the inlucded systems.
-                        self.systemT.scope.each_included do |included|
-                            isout = included.get_output(key)
-                            break if isout
-                        end
-                    end
+                    # isout = self.get_output(key)
+                    # unless isout then
+                    #     # Look into the inlucded systems.
+                    #     self.systemT.scope.each_included do |included|
+                    #         isout = included.get_output(key)
+                    #         break if isout
+                    #     end
+                    # end
+                    isout = self.systemT.get_output_with_included(key)
                     # Convert it to a reference.
+                    # puts "key=#{key} value=#{value} signal=#{signal}"
                     ref = RefObject.new(self.to_ref,signal)
-                    # puts "key=#{key} value=#{value} signal=#{signal} ref=#{ref}"
                     # Make the connection.
                     if isout then
                         value <= ref
@@ -2135,6 +2225,8 @@ module HDLRuby::High
         # NOTE: actually executes +ruby_block+ in the context of the
         #       systemT.
         def open(&ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Extend the eigen system.
             @systemT.run(&ruby_block)
             # Update the methods.
@@ -2196,7 +2288,15 @@ module HDLRuby::High
         # system type.
         def method_missing(m, *args, &ruby_block)
             # print "method_missing in class=#{self.class} with m=#{m}\n"
-            self.public_namespace.send(m,*args,&ruby_block)
+            # Maybe its a signal reference.
+            signal = self.systemT.get_signal_with_included(m)
+            if signal then
+                # Yes, create the reference.
+                return RefObject.new(self.to_ref,signal)
+            else
+                # No try elsewhere
+                self.public_namespace.send(m,*args,&ruby_block)
+            end
         end
 
 
@@ -2331,6 +2431,8 @@ module HDLRuby::High
         #
         # Can only be used once.
         def helse(mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # If there is a no block, it is an error.
             raise AnyError, "Cannot have two helse for a single if statement." if self.no
             # Create the no block if required
@@ -2345,6 +2447,8 @@ module HDLRuby::High
         #
         # Can only be used if the no-block is not set yet.
         def helsif(next_cond, mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # If there is a no block, it is an error.
             raise AnyError, "Cannot have an helsif after an helse." if self.no
             # Create the noif block if required
@@ -2413,6 +2517,8 @@ module HDLRuby::High
         #
         # Can only be used once for the given +match+.
         def hwhen(match, mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Create the nu block if required
             when_block = High.make_block(mode,&ruby_block)
             # Adds the case.
@@ -2424,6 +2530,8 @@ module HDLRuby::High
         #
         # Can only be used once.
         def helse(mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Create the nu block if required
             default_block = High.make_block(mode,&ruby_block)
             # Sets the default block.
@@ -3158,7 +3266,8 @@ module HDLRuby::High
 
         # Converts the name reference to a HDLRuby::Low::RefName.
         def to_low
-            # puts "to_low with base=#{@base} @object=#{@object.name}"
+            # puts "to_low with base=#{@base} @object=#{@object}"
+            # puts "@object.name=#{@object.name}"
             refNameL = HDLRuby::Low::RefName.new(self.type.to_low,
                                              @base.to_ref.to_low,@object.name)
             # # For debugging: set the source high object 
@@ -3794,11 +3903,15 @@ module HDLRuby::High
         # Creates a new block with the current mode with possible +name+ and
         # built from +ruby_block+.
         def sub(name = :"", &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             self.add_block(self.mode,name,&ruby_block)
         end
 
         # Adds statements at the top of the block.
         def unshift(&ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Create a sub block for the statements.
             block = High.make_block(self.mode,:"",&ruby_block)
             # Unshifts it.
@@ -3843,6 +3956,8 @@ module HDLRuby::High
         #
         # NOTE: the else part is defined through the helse method.
         def hif(condition, mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Creates the if statement.
             self.add_statement(If.new(condition,mode,&ruby_block))
         end
@@ -3852,6 +3967,8 @@ module HDLRuby::High
         #
         # Can only be used once.
         def helse(mode = nil, &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
             # the hif in the same block.
             # Completes the hif or the hcase statement.
@@ -3866,6 +3983,8 @@ 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)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # There is a ruby_block: the helse is assumed to be with
             # the hif in the same block.
             # Completes the hif statement.
@@ -3893,6 +4012,8 @@ module HDLRuby::High
         #
         # Can only be used once.
         def hwhen(match, mode = nil, &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
             # the hif in the same block.
             # Completes the hcase statement.
@@ -4008,6 +4129,8 @@ module HDLRuby::High
         # Adds a loop until +delay+ statement in the block in +mode+ whose
         # loop content is built using +ruby_block+.
         def repeat(delay, mode = nil, &ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             # Build the content block.
             content = High.make_block(mode,&ruby_block)
             # Create and add the statement.
@@ -4666,6 +4789,8 @@ module HDLRuby::High
         # Creates a hcase statement executing +ruby_block+ on the element of
         # the array selected by +value+
         def hcase(value,&ruby_block)
+            # Ensure there is a block.
+            ruby_block = proc {} unless block_given?
             High.cur_block.hcase(value)
             self.each.with_index do |elem,i|
                 High.cur_block.hwhen(i) { ruby_block.call(elem) }