fam 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e083defa9264bec1a8aa528283008c7ac5041b88da8ef8eb0afb02c3748d13
-  data.tar.gz: f96c773b8fb78d623213df185831f1598e463f5a8ba899b1bda2fc6411062a1d
+  metadata.gz: e38f107dfcb9efdeb43affd220b7ef40b662ddf35f21b070753fecc6bf953d25
+  data.tar.gz: 596acf48da4a1c333ad15b1ab8b4032f75ed02d8709d69dfca4a5f679807277f
 SHA512:
-  metadata.gz: 23a04cb33765547dd9abca66c77135f05b3ee312aaa355c85d5814d6424fdbdd677f8765b480bf3520fb48d247a703297ff3f4513f79c30d4d47c8439fcd4b55
-  data.tar.gz: 6e6556694a26ba109824cc1f7deecd942841688d178995ff680eb0cbeb6ca002c19136069cd5f550f7bdd0f3e42bf1496975daefbe4d4cb4d98b9fe2ecc435d3
+  metadata.gz: dfcc9df73fe1d1dbd3c4d5871392da853801db10bef0fd4972a0ea2a48224c36c7f16d755509df56bfcc38b15b9b12060af80798d6d945220cd7544180ab3165
+  data.tar.gz: 820eedd878734ceaca7bdc7e994f7649c18c09f2c62f5e6fc1365e9a50bf0605fc05675f1a0122eeb82d4876efaa83173a595ef8550588cfa5f2de2b5d6041ac

data/lib/fam.rb

@@ -5,7 +5,7 @@ class Object
 end
 
 module FAM
-  VERSIONS = { :major => 0, :minor => 0, :tiny => 2 }
+  VERSIONS = { :major => 0, :minor => 1, :tiny => 0 }
 
   def self.version *args
     VERSIONS.flatten.select.with_index { |val, i| i.odd? }.join '.'

data/lib/fam/machine/cpu.rb

@@ -5,6 +5,8 @@ module FAM::Machine
   class CPU
     include FAM::Syntax
     attr_reader :ram, :registers, :memory_aliases, :labels
+    attr_reader :inputting, :outputting, :halted
+    attr_reader :output
 
     def initialize ram
       @ram = ram
@@ -18,6 +20,10 @@ module FAM::Machine
       @labels = Hash.new
       @last_jump = nil
       @back_index = 0
+      @tree_index = -1
+      @halted = false
+      @outputting = @inputting = false
+      @output = String.new
     end
 
     def self.quick_run ram, parsed, &block
@@ -34,7 +40,6 @@ module FAM::Machine
       @block = block if block_given?
       @parsed = parsed
 
-      @tree_index = -1
       while @tree_index < parsed.tree.size
         @tree_index += 1
 
@@ -48,7 +53,21 @@ module FAM::Machine
       end
     end
 
+    def step parsed
+      @parsed = parsed
+      return {:state => 'done'} if @tree_index >= parsed.tree.size || @halted
+      @tree_index += 1
+      node = parsed[@tree_index]
+      status = execute node
+      if status == :STOP
+        @halted = true
+        return {:state => 'done'}
+      end
+      {:state => 'running', :input => @inputting, :output => @outputting}
+    end
+
     def execute node
+      @outputting = @inputting = false
       @registers[:PC] = @tree_index
       @block.call @registers[:PC] unless @block.nil?
       case node
@@ -98,8 +117,9 @@ module FAM::Machine
       when AST::InNode
         @registers[node.register.register.to_sym] = cpu_input
       when AST::OutNode, AST::AsciiNode
+        @outputting = true
         value = get_value node, node.value
-        cpu_output value, (node.base_name == 'OutNode' ? :PLAIN : :ASCII)
+        @output = cpu_output(value, (node.base_name == 'OutNode' ? :PLAIN : :ASCII))
       when AST::SubNode, AST::AddNode, AST::MulNode, AST::DivNode, AST::ModNode
         value = get_value node, node.value
         ExpectedNode 'REGISTER', node.to unless node.to.base_name == 'RegisterNode'
@@ -143,7 +163,8 @@ module FAM::Machine
     end
 
     def cpu_output out, ascii=:PLAIN  # Ment to be changed
-      puts "OUTPUT: #{ascii != :PLAIN ? out.chr : out }"
+      show = ascii == :PLAIN ? out.to_s : out.chr
+      puts "OUTPUT: #{show}"
     end
 
     private def get_value super_value, value_node
@@ -161,12 +182,12 @@ module FAM::Machine
       end
     end
 
-    private def UnexpectedNode node, sub_node
+    def UnexpectedNode node, sub_node
       print "\n" * (@ram.to_s.count("\n") + 1) if $VERBOSE
       abort ("Unexpected Node, you've given `#{sub_node.base_name}` AST::to Node: `#{node.base_name}`?").red.bold
     end
 
-    private def ExpectedNode expect, got
+    def ExpectedNode expect, got
       print "\n" * (@ram.to_s.count("\n") + 1) if $VERBOSE
       abort ("Expected: `#{expect}`, but insted got: `#{got}`").red.bold
     end

data/lib/fam/machine/memory.rb

@@ -17,7 +17,7 @@ module FAM::Machine
       when Numeric
         alloc = size
       when String
-        suffix = size.upcase[/[A-Z]+/]
+        suffix = size.upcase[/[A-Z]+/] || ''
         suffix = 'kB' if suffix == 'KB'
         unless suffix.empty?
           alloc = size[/[0-9]+/].to_i * SIZES[suffix.to_sym]
@@ -39,6 +39,10 @@ module FAM::Machine
       @array[i] = value
     end
 
+    def to_a
+      @array
+    end
+
     def to_s
       result = String.new
       width = %x{ tput cols }.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fam
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Demonstrandum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies: []
 description: A very watered down language ment to look like an assembly language.
 email: knutsen@jetspace.co