fam 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a521187255f27791f45b197a66fa69160a5d37cb2d6599a59d7001fd2b86ff
-  data.tar.gz: 25f69d87e3148bc616964bcc15287c5b6fd6406548251a730a5b48abaddef081
+  metadata.gz: 48e083defa9264bec1a8aa528283008c7ac5041b88da8ef8eb0afb02c3748d13
+  data.tar.gz: f96c773b8fb78d623213df185831f1598e463f5a8ba899b1bda2fc6411062a1d
 SHA512:
-  metadata.gz: 570f5e1160997bdcd2f8e9aa15d81068cef6b5bc94ec2483715baa3d25b5af90840375d2ef546a793aad728ce8e89a93224a70fc71ebf5af657759160de5bb78
-  data.tar.gz: 7675fc3184c4210a21f47cc2a35991a40faccbd1bd9f1953ab2d8a8ca3da258511b305d45b73306b1c9a3a0223d5a1353439bd64a0c82d99222eff798d699e61
+  metadata.gz: 23a04cb33765547dd9abca66c77135f05b3ee312aaa355c85d5814d6424fdbdd677f8765b480bf3520fb48d247a703297ff3f4513f79c30d4d47c8439fcd4b55
+  data.tar.gz: 6e6556694a26ba109824cc1f7deecd942841688d178995ff680eb0cbeb6ca002c19136069cd5f550f7bdd0f3e42bf1496975daefbe4d4cb4d98b9fe2ecc435d3

data/bin/fam

@@ -2,11 +2,11 @@
 
 require 'fam'
 
-$VERBOSE = false
+$VERBOSE = true
 $CLOCK = $VERBOSE ? 20 : Float::INFINITY
 
 file_names = ARGV.select { |file| file.include? '.fam'}
-lexed = FAM::Syntax::Lexer.lex file_names[-1]
+lexed = FAM::Syntax::Lexer.lex File.read file_names[-1]
 puts lexed if $VERBOSE
 puts if $VERBOSE
 
@@ -21,3 +21,13 @@ puts if $VERBOSE
 CPU.run AST do |pc|
   puts "Program counter: #{pc}" if $VERBOSE
 end
+
+
+#==== Shortened built in method: ====#
+
+#file_names = ARGV.select { |file| file.include? '.fam'}
+#FAM.run File.read(file_names[-1]), :allocate => '100B' do |ram, pc, registers|
+#  puts "RAM:\n#{ram}"
+#  puts "PC:  #{pc}"
+#  puts "REG: #{registers}"
+#end

data/lib/fam.rb

@@ -5,7 +5,7 @@ class Object
 end
 
 module FAM
-  VERSIONS = { :major => 0, :minor => 0, :tiny => 1 }
+  VERSIONS = { :major => 0, :minor => 0, :tiny => 2 }
 
   def self.version *args
     VERSIONS.flatten.select.with_index { |val, i| i.odd? }.join '.'
@@ -14,3 +14,25 @@ end
 
 Dir["#{File.dirname __FILE__}/fam/*.rb"].each    { |f| require f }
 Dir["#{File.dirname __FILE__}/fam/**/*.rb"].each { |f| require f }
+
+module FAM
+  def self.run string, allocate: '200B', clock: 6, verbose: false, &block
+    $VERBOSE = verbose
+    $CLOCK = clock
+
+    lexed = Syntax::Lexer.lex string
+    puts lexed if $VERBOSE
+    puts if $VERBOSE
+    parsed = Syntax::Parser.parse lexed.tokens
+    tree = parsed.ast
+    pp tree if $VERBOSE
+    ram = Machine::RAM.new allocate
+    cpu = Machine::CPU.new ram
+    puts if $VERBOSE
+    cpu.run tree do |pc|
+      puts "Program counter: #{pc}" if $VERBOSE
+      yield cpu.ram, pc, cpu.registers if block_given?
+    end
+    cpu
+  end
+end

data/lib/fam/syntax/lexer.rb

@@ -4,20 +4,19 @@ module FAM::Syntax
   class Lexer
     attr_reader :tokens
 
-    def initialize io_file
-      @file_name = io_file
+    def initialize string
+      @raw = string
       @tokens = TokenStream.new
     end
 
-    def self.lex io_file
-      obj = self.new io_file
+    def self.lex string
+      obj = self.new string
       obj.lexer
       obj
     end
 
     def lexer
       puts "Lexing..." if $VERBOSE
-      @raw = File.read @file_name
       @raw << EOF unless @raw[-1] == EOF
 
       loc = {:line => 1, :col => 1}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fam
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Demonstrandum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies: []
 description: A very watered down language ment to look like an assembly language.
 email: knutsen@jetspace.co
@@ -31,7 +31,7 @@ files:
 - lib/fam/syntax/tokens.rb
 homepage: https://github.com/Demonstrandum/FAM
 licenses:
-- GPL-3.0
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []