logicuit 0.2.0 → 0.3.1

data/lib/logicuit/gates/nand.rb

@@ -3,18 +3,16 @@
 module Logicuit
   module Gates
     # NAND gate
-    class Nand < Base
-      tag :NAND
-
+    class Nand < DSL
       diagram <<~DIAGRAM
-        (A)-|
+        (A)-|    |
             |NAND|-(Y)
-        (B)-|
+        (B)-|    |
       DIAGRAM
 
-      define_inputs :a, :b
+      inputs :a, :b
 
-      define_outputs y: ->(a, b) { !(a && b) }
+      outputs y: -> { !(a && b) }
 
       truth_table <<~TRUTH_TABLE
         | A | B | Y |

data/lib/logicuit/gates/not.rb

@@ -3,16 +3,14 @@
 module Logicuit
   module Gates
     # NOT gate
-    class Not < Base
-      tag :NOT
-
+    class Not < DSL
       diagram <<~DIAGRAM
         (A)-|NOT|-(Y)
       DIAGRAM
 
-      define_inputs :a
+      inputs :a
 
-      define_outputs y: ->(a) { !a } # rubocop:disable Style/SymbolProc
+      outputs y: -> { !a }
 
       truth_table <<~TRUTH_TABLE
         | A | Y |

data/lib/logicuit/gates/or.rb

@@ -3,18 +3,16 @@
 module Logicuit
   module Gates
     # OR gate
-    class Or < Base
-      tag :OR
-
+    class Or < DSL
       diagram <<~DIAGRAM
-        (A)-|
+        (A)-|  |
             |OR|-(Y)
-        (B)-|
+        (B)-|  |
       DIAGRAM
 
-      define_inputs :a, :b
+      inputs :a, :b
 
-      define_outputs y: ->(a, b) { a || b }
+      outputs y: -> { a || b }
 
       truth_table <<~TRUTH_TABLE
         | A | B | Y |

data/lib/logicuit/gates/xor.rb

@@ -3,18 +3,16 @@
 module Logicuit
   module Gates
     # XOR gate
-    class Xor < Base
-      tag :XOR
-
+    class Xor < DSL
       diagram <<~DIAGRAM
-        (A)-|
+        (A)-|   |
             |XOR|-(Y)
-        (B)-|
+        (B)-|   |
       DIAGRAM
 
-      define_inputs :a, :b
+      inputs :a, :b
 
-      define_outputs y: ->(a, b) { (a && !b) || (!a && b) }
+      outputs y: -> { (a && !b) || (!a && b) }
 
       truth_table <<~TRUTH_TABLE
         | A | B | Y |

data/lib/logicuit/runner.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Logicuit module
+module Logicuit
+  def self.run(circuit, hz: 1, noclear: false)
+    render = lambda {
+      system("clear") unless noclear
+      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 && hz.nonzero?
+      Thread.new do
+        loop do
+          render.call
+          sleep 1.0 / hz
+          Signals::Clock.tick
+        end
+      end
+    else
+      render.call
+    end
+
+    while (input = gets.chomp)
+      key = input.to_sym
+      unless circuit.respond_to? key
+        if circuit.clock && hz.zero?
+          Signals::Clock.tick
+          render.call
+        end
+        next
+      end
+
+      signal = circuit.send(key)
+      if signal.current
+        signal.off
+      else
+        signal.on
+      end
+      render.call
+    end
+  end
+end

data/lib/logicuit/signals/clock.rb

@@ -5,36 +5,39 @@ module Logicuit
     # Clock
     class Clock
       def initialize
-        @on_tick = []
+        @downstreams = []
         @tick_count = 0
       end
 
-      attr_reader :on_tick, :tick_count
+      attr_reader :downstreams, :tick_count
 
       def tick
         @tick_count += 1
         # Call the `evaluate` method for all components.
-        # However, the input argument values should be bound to the values at the time `on_tick` is called.
-        @on_tick.map do |component|
+        # However, the input argument values should be bound to the values at the time `tick` is called.
+        @downstreams.map do |component|
           args = component.input_targets.map { |input| component.instance_variable_get("@#{input}").current }
           -> { component.evaluate(*args) }
         end.each(&:call)
       end
 
-      def self.instance
-        @instance ||= new
-      end
+      class << self
+        def instance
+          @instance ||= new
+        end
 
-      def self.on_tick
-        instance.on_tick
-      end
+        def connects_to(component)
+          instance.downstreams << component
+        end
+        alias >> connects_to
 
-      def self.tick
-        instance.tick
-      end
+        def tick
+          instance.tick
+        end
 
-      def self.tick_count
-        instance.tick_count
+        def tick_count
+          instance.tick_count
+        end
       end
     end
   end

data/lib/logicuit/signals/signal.rb

@@ -4,49 +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
-        self
+        propagate_current
       end
 
       def off
-        changed = @current
-        @current = false
-        @on_change.each(&:evaluate) if changed
-        self
-      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,32 @@
+# 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 { _1.current ? "1" : "0" }.join
+      end
+
+      def set(vals)
+        vals.split("").zip(signals).each do |v, o|
+          v == "1" ? o.on : o.off
+        end
+      end
+    end
+  end
+end

data/lib/logicuit/version.rb

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

data/lib/logicuit.rb

@@ -1,24 +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/combinational/multiplexer_2to1"
 require_relative "logicuit/circuits/combinational/multiplexer_4to1"
 require_relative "logicuit/circuits/combinational/half_adder"
 require_relative "logicuit/circuits/combinational/full_adder"
 require_relative "logicuit/circuits/combinational/full_adder_4bit"
-require_relative "logicuit/circuits/combinational/decoder"
-require_relative "logicuit/circuits/rom/timer"
 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/system_level/one_bit_cpu"
-require_relative "logicuit/circuits/system_level/one_bit_cpu2"
-require_relative "logicuit/circuits/system_level/cpu_td4"
+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.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Koji NAKAMURA
 bindir: exe
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: logi(c cir)cuit -> logicuit
 email:
@@ -21,27 +21,29 @@ files:
 - README.md
 - Rakefile
 - lib/logicuit.rb
-- lib/logicuit/base.rb
-- lib/logicuit/circuits/combinational/decoder.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/multiplexer_2to1.rb
 - lib/logicuit/circuits/combinational/multiplexer_4to1.rb
-- lib/logicuit/circuits/rom/timer.rb
 - lib/logicuit/circuits/sequential/d_flip_flop.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/system_level/cpu_td4.rb
-- lib/logicuit/circuits/system_level/one_bit_cpu.rb
-- lib/logicuit/circuits/system_level/one_bit_cpu2.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
@@ -66,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: logi(c cir)cuit -> logicuit
 test_files: []

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