logicuit 0.1.5 → 0.3.0

data/lib/logicuit/signals/signal.rb

@@ -4,47 +4,54 @@ module Logicuit
   module Signals
     # Signal
     class Signal
-      def initialize(current = false) # rubocop:disable Style/OptionalBooleanParameter
+      def initialize(current = false)
         @current = current
-        @connected_by = nil
-        @on_change = []
+        @downstreams = []
       end
 
-      attr_reader :current, :on_change
-      attr_accessor :connected_by
+      attr_reader :current
 
       def on
-        changed = @current.!
+        return if @current
+
         @current = true
-        @on_change.each(&:evaluate) if changed
+        propagate_current
       end
 
       def off
-        changed = @current
-        @current = false
-        @on_change.each(&:evaluate) if changed
-      end
+        return unless @current
 
-      def toggle
-        @current ? off : on
+        @current = false
+        propagate_current
       end
 
       def connects_to(other)
-        other.connected_by = self
-        other.evaluate
-        on_change << other
+        if other.is_a? Array
+          @downstreams.concat(other)
+        elsif other.is_a? Signals::SignalGroup
+          @downstreams.concat(other.signals)
+        else
+          @downstreams << other
+        end
+        propagate_current
       end
       alias >> connects_to
 
-      def evaluate
-        return if @connected_by.nil?
-
-        @connected_by.current ? on : off
-      end
-
       def to_s
         current ? "1" : "0"
       end
+
+      private
+
+      def propagate_current
+        @downstreams.each do |downstream|
+          if downstream.is_a?(Signal)
+            current ? downstream.on : downstream.off
+          elsif downstream.respond_to?(:evaluate)
+            downstream.evaluate
+          end
+        end
+      end
     end
   end
 end

data/lib/logicuit/signals/signal_group.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Logicuit
+  module Signals
+    # Signal Group
+    class SignalGroup
+      def initialize(*signals)
+        @signals = signals
+      end
+
+      def signals
+        @signals.dup
+      end
+
+      def connects_to(others)
+        others = others.signals if others.is_a?(SignalGroup)
+        @signals.zip(others).each { _1 >> _2 unless _1.nil? || _2.nil? }
+      end
+      alias >> connects_to
+
+      def to_s
+        signals.map { it.current ? "1" : "0" }.join
+      end
+    end
+  end
+end

data/lib/logicuit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logicuit
-  VERSION = "0.1.5"
+  VERSION = "0.3.0"
 end

data/lib/logicuit.rb

@@ -1,16 +1,26 @@
 # frozen_string_literal: true
 
 require_relative "logicuit/version"
-require_relative "logicuit/base"
+require_relative "logicuit/dsl"
+require_relative "logicuit/array_as_signal_group"
+require_relative "logicuit/runner"
 require_relative "logicuit/gates/and"
 require_relative "logicuit/gates/or"
 require_relative "logicuit/gates/not"
 require_relative "logicuit/gates/nand"
 require_relative "logicuit/gates/xor"
 require_relative "logicuit/signals/signal"
+require_relative "logicuit/signals/signal_group"
 require_relative "logicuit/signals/clock"
-require_relative "logicuit/circuits/sequential/d_flip_flop"
-require_relative "logicuit/circuits/combinational/multiplexer2to1"
-require_relative "logicuit/circuits/combinational/multiplexer4to1"
+require_relative "logicuit/circuits/combinational/multiplexer_2to1"
+require_relative "logicuit/circuits/combinational/multiplexer_4to1"
 require_relative "logicuit/circuits/combinational/half_adder"
-require_relative "logicuit/circuits/system_level/one_bit_cpu"
+require_relative "logicuit/circuits/combinational/full_adder"
+require_relative "logicuit/circuits/combinational/full_adder_4bit"
+require_relative "logicuit/circuits/sequential/d_flip_flop"
+require_relative "logicuit/circuits/sequential/register_4bit"
+require_relative "logicuit/circuits/sequential/program_counter"
+require_relative "logicuit/circuits/sequential/one_bit_cpu"
+require_relative "logicuit/circuits/td4/cpu"
+require_relative "logicuit/circuits/td4/decoder"
+require_relative "logicuit/circuits/td4/rom"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logicuit
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Koji NAKAMURA
 bindir: exe
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-04-19 00:00:00.000000000 Z
 dependencies: []
 description: logi(c cir)cuit -> logicuit
 email:
@@ -21,19 +21,29 @@ files:
 - README.md
 - Rakefile
 - lib/logicuit.rb
-- lib/logicuit/base.rb
+- lib/logicuit/array_as_signal_group.rb
+- lib/logicuit/circuits/combinational/full_adder.rb
+- lib/logicuit/circuits/combinational/full_adder_4bit.rb
 - lib/logicuit/circuits/combinational/half_adder.rb
-- lib/logicuit/circuits/combinational/multiplexer2to1.rb
-- lib/logicuit/circuits/combinational/multiplexer4to1.rb
+- lib/logicuit/circuits/combinational/multiplexer_2to1.rb
+- lib/logicuit/circuits/combinational/multiplexer_4to1.rb
 - lib/logicuit/circuits/sequential/d_flip_flop.rb
-- lib/logicuit/circuits/system_level/one_bit_cpu.rb
+- lib/logicuit/circuits/sequential/one_bit_cpu.rb
+- lib/logicuit/circuits/sequential/program_counter.rb
+- lib/logicuit/circuits/sequential/register_4bit.rb
+- lib/logicuit/circuits/td4/cpu.rb
+- lib/logicuit/circuits/td4/decoder.rb
+- lib/logicuit/circuits/td4/rom.rb
+- lib/logicuit/dsl.rb
 - lib/logicuit/gates/and.rb
 - lib/logicuit/gates/nand.rb
 - lib/logicuit/gates/not.rb
 - lib/logicuit/gates/or.rb
 - lib/logicuit/gates/xor.rb
+- lib/logicuit/runner.rb
 - lib/logicuit/signals/clock.rb
 - lib/logicuit/signals/signal.rb
+- lib/logicuit/signals/signal_group.rb
 - lib/logicuit/version.rb
 - sig/logicuit.rbs
 homepage: https://github.com/kozy4324/logicuit

data/lib/logicuit/base.rb

@@ -1,172 +0,0 @@
-# frozen_string_literal: true
-
-# Logicuit module
-module Logicuit
-  # base class for all gates and circuits
-  class Base # rubocop:disable Metrics/ClassLength
-    def self.tag(*tags)
-      tags.each do |tag|
-        registry[tag] = self
-      end
-    end
-
-    @@registry = {} # rubocop:disable Style/ClassVars
-
-    def self.registry
-      @@registry
-    end
-
-    def initialize(*args)
-      @input_targets = []
-      @output_targets = []
-      @clock = false
-      define_inputs(*args) if respond_to?(:define_inputs)
-      define_outputs if respond_to?(:define_outputs)
-      assembling if respond_to?(:assembling)
-      evaluate if respond_to?(:evaluate)
-    end
-
-    attr_reader :input_targets, :output_targets, :clock
-
-    def self.define_inputs(*args, **kwargs) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
-      args.each do |input|
-        define_method(input) do
-          instance_variable_get("@#{input}")
-        end
-      end
-
-      define_method(:define_inputs) do |*instance_method_args|
-        instance_variable_set("@clock", true) if kwargs&.key?(:clock)
-        args.each_with_index do |input, index|
-          signal = Signals::Signal.new(instance_method_args[index] == 1)
-          signal.on_change << self unless clock
-          instance_variable_set("@#{input}", signal)
-          @input_targets << input
-        end
-        Signals::Clock.on_tick << self if clock
-      end
-    end
-
-    def self.define_outputs(*args, **kwargs) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
-      (args + kwargs.keys).each do |output|
-        define_method(output) do
-          instance_variable_get("@#{output}")
-        end
-      end
-
-      define_method(:define_outputs) do
-        (args + kwargs.keys).each do |output|
-          instance_variable_set("@#{output}", Signals::Signal.new(false))
-          @output_targets << output
-        end
-      end
-
-      define_method(:evaluate) do
-        kwargs.each do |output, evaluator|
-          signal = instance_variable_get("@#{output}")
-          if evaluator.call(*@input_targets.map do |input|
-            instance_variable_get("@#{input}").current
-          end)
-            signal.on
-          else
-            signal.off
-          end
-        end
-      end
-    end
-
-    def self.assembling
-      define_method(:assembling) do
-        yield(*(@input_targets + @output_targets).map { |target| instance_variable_get("@#{target}") })
-      end
-    end
-
-    def self.diagram(source)
-      define_method(:to_s) do
-        (@input_targets + @output_targets).reduce(source) do |result, input|
-          result.gsub(/\(#{input}\)/i, "(#{instance_variable_get("@#{input}")})#{"-" * (input.size - 1)}")
-        end
-      end
-    end
-
-    def self.truth_table(source) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      define_method(:truth_table) do # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/BlockLength
-        rows = source.strip.split("\n")
-        headers = rows.shift.split("|").map(&:strip).reject(&:empty?).map(&:downcase).map(&:to_sym)
-        rows.shift # devide line
-        table = rows.map do |row|
-          row.split("|").map(&:strip).reject(&:empty?).map(&:downcase).map do |v|
-            case v
-            when "^"
-              :clock
-            when "x"
-              :any
-            when "1"
-              true
-            when "0"
-              false
-            else
-              raise "Invalid value in truth table: #{v}"
-            end
-          end
-        end.select do |values| # rubocop:disable Style/MultilineBlockChain
-          headers.size == values.size
-        end.map do |values| # rubocop:disable Style/MultilineBlockChain
-          array = [values]
-          while array.any? { |values| values.any? { |v| v == :any } }
-            target_index = array.find_index { |values| values.any? { |v| v == :any } }
-            target = array[target_index]
-            prop_index = target.find_index { |v| v == :any }
-            array.delete_at(target_index)
-            array.insert(target_index, *[true, false].map do |v|
-              target.dup.tap do |a|
-                a[prop_index] = v
-              end
-            end)
-          end
-          array
-        end.flatten!(1).map do |values| # rubocop:disable Style/MultilineBlockChain
-          headers.zip(values).to_h
-        end
-        table
-      end
-    end
-  end
-
-  def self.run(sym) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
-    circuit = Base.registry[sym.upcase.to_sym].new
-
-    render = lambda {
-      system("clear")
-      puts circuit
-      puts
-      puts "tick: #{Signals::Clock.tick_count}" if circuit.clock
-      puts "input: #{circuit.input_targets.join ","}?" if circuit.input_targets.any?
-    }
-
-    if circuit.clock
-      Thread.new do
-        loop do
-          render.call
-          sleep 1
-          Signals::Clock.tick
-        end
-      end
-    else
-      render.call
-    end
-
-    while (input = gets)
-      key = input.chomp.to_sym
-      next unless circuit.respond_to? key
-
-      signal = circuit.send(key)
-      if signal.current
-        signal.off
-      else
-        signal.on
-      end
-      render.call
-    end
-  end
-end

data/lib/logicuit/circuits/system_level/one_bit_cpu.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Logicuit
-  module Circuits
-    module SystemLevel
-      # 1 bit CPU
-      class OneBitCpu < Base
-        tag :ONE_BIT_CPU
-
-        diagram <<~DIAGRAM
-          +-------------+
-          |             |
-          +-|NOT|-|   |-+-(Y)
-                  |DFF|
-             (CK)-|>  |
-        DIAGRAM
-
-        define_inputs clock: :ck
-
-        define_outputs :y
-
-        assembling do |y|
-          dff = Sequential::DFlipFlop.new
-          not_gate = Gates::Not.new
-
-          dff.q >> not_gate.a
-          not_gate.y >> dff.d
-
-          dff.q >> y
-        end
-
-        truth_table <<~TRUTH_TABLE
-          | CK | prev Y | Y |
-          | -- | ------ | - |
-          |  ^ |      0 | 1 |
-          |  ^ |      1 | 0 |
-        TRUTH_TABLE
-      end
-    end
-  end
-end