From 2bc2d4486fd81b5051133eca485ba52012e97aef Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Wed, 18 Nov 2015 12:00:30 +0200 Subject: [PATCH] move interpreter to register seems more where it belongs, since it interprets the register machine instructions --- lib/{interpreter => register}/eventable.rb | 0 lib/{interpreter => register}/interpreter.rb | 2 +- test/compiler/fragments/helper.rb | 4 ++-- test/interpreter/helper.rb | 4 ++-- test/parfait/helper.rb | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename lib/{interpreter => register}/eventable.rb (100%) rename lib/{interpreter => register}/interpreter.rb (99%) diff --git a/lib/interpreter/eventable.rb b/lib/register/eventable.rb similarity index 100% rename from lib/interpreter/eventable.rb rename to lib/register/eventable.rb diff --git a/lib/interpreter/interpreter.rb b/lib/register/interpreter.rb similarity index 99% rename from lib/interpreter/interpreter.rb rename to lib/register/interpreter.rb index 22f7aab5..d9d1e161 100644 --- a/lib/interpreter/interpreter.rb +++ b/lib/register/interpreter.rb @@ -1,7 +1,7 @@ require_relative "eventable" -module Interpreter +module Register class Interpreter # fire events for changed pc and register contents include Eventable diff --git a/test/compiler/fragments/helper.rb b/test/compiler/fragments/helper.rb index f5136b0c..8969e7c0 100644 --- a/test/compiler/fragments/helper.rb +++ b/test/compiler/fragments/helper.rb @@ -1,5 +1,5 @@ require_relative '../../helper' -require "interpreter/interpreter" +require "register/interpreter" # Fragments are small programs that we run through the interpreter and really only check # - the no. of instructions processed @@ -16,7 +16,7 @@ module Fragments machine = Register.machine.boot machine.parse_and_compile @string_input machine.collect - @interpreter = Interpreter::Interpreter.new + @interpreter = Register::Interpreter.new @interpreter.start machine.init count = 0 begin diff --git a/test/interpreter/helper.rb b/test/interpreter/helper.rb index 1d871037..b0162a9e 100644 --- a/test/interpreter/helper.rb +++ b/test/interpreter/helper.rb @@ -1,5 +1,5 @@ require_relative "../helper" -require "interpreter/interpreter" +require "register/interpreter" module Ticker @@ -10,7 +10,7 @@ module Ticker #puts parts.inspect Soml.compile( parts ) machine.collect - @interpreter = Interpreter::Interpreter.new + @interpreter = Register::Interpreter.new @interpreter.start Register.machine.init end diff --git a/test/parfait/helper.rb b/test/parfait/helper.rb index 9f4d1e54..5e2c2c04 100644 --- a/test/parfait/helper.rb +++ b/test/parfait/helper.rb @@ -1,5 +1,5 @@ require_relative '../helper' -require "interpreter/interpreter" +require "register/interpreter" require "rye" Rye::Cmd.add_command :ld, '/usr/bin/ld' Rye::Cmd.add_command :aout, './a.out' @@ -23,7 +23,7 @@ HERE Soml::Compiler.load_parfait machine.parse_and_compile main.sub("PROGRAM" , @string_input ) machine.collect - @interpreter = Interpreter::Interpreter.new + @interpreter = Register::Interpreter.new @interpreter.start machine.init count = 0 begin