Unify instruction namings also dirs

Was getting confused myself, where it was instruction or instructions, when if the base class was inside or out of dir. Now dirs are plural, and base class is inside.
2020-03-02 17:58:13 +02:00 · 2020-03-02 17:58:13 +02:00 · db5a59f735
commit db5a59f735
parent f3d299208e
36 changed files with 34 additions and 34 deletions
--- a/lib/risc.rb
+++ b/lib/risc.rb
@ -39,7 +39,7 @@ class Integer
 end


-require_relative "risc/instruction"
+require_relative "risc/instructions/instruction"
 require_relative "risc/register_value"
 require_relative "risc/register_slot"
 require_relative "risc/text_writer"
--- a/lib/risc/instructions/instruction.rb
+++ b/lib/risc/instructions/instruction.rb
@ -57,19 +57,19 @@ module Risc

 end

-require_relative "instructions/setter"
-require_relative "instructions/getter"
-require_relative "instructions/reg_to_slot"
-require_relative "instructions/slot_to_reg"
-require_relative "instructions/reg_to_byte"
-require_relative "instructions/byte_to_reg"
-require_relative "instructions/load_constant"
-require_relative "instructions/load_data"
-require_relative "instructions/syscall"
-require_relative "instructions/function_call"
-require_relative "instructions/function_return"
-require_relative "instructions/transfer"
-require_relative "instructions/label"
-require_relative "instructions/branch"
-require_relative "instructions/dynamic_jump"
-require_relative "instructions/operator_instruction"
+require_relative "setter"
+require_relative "getter"
+require_relative "reg_to_slot"
+require_relative "slot_to_reg"
+require_relative "reg_to_byte"
+require_relative "byte_to_reg"
+require_relative "load_constant"
+require_relative "load_data"
+require_relative "syscall"
+require_relative "function_call"
+require_relative "function_return"
+require_relative "transfer"
+require_relative "label"
+require_relative "branch"
+require_relative "dynamic_jump"
+require_relative "operator_instruction"
--- a/lib/slot_machine/instructions/argument_transfer.rb
+++ b/lib/slot_machine/instructions/argument_transfer.rb
--- a/lib/slot_machine/instructions/block_yield.rb
+++ b/lib/slot_machine/instructions/block_yield.rb
--- a/lib/slot_machine/instructions/check.rb
+++ b/lib/slot_machine/instructions/check.rb
--- a/lib/slot_machine/instructions/dynamic_call.rb
+++ b/lib/slot_machine/instructions/dynamic_call.rb
--- a/lib/slot_machine/instructions/instruction.rb
+++ b/lib/slot_machine/instructions/instruction.rb
@ -38,19 +38,18 @@ module SlotMachine

 end

-require_relative "basic_values"
-require_relative "instruction/label"
-require_relative "instruction/check"
-require_relative "instruction/simple_call"
-require_relative "instruction/dynamic_call"
-require_relative "instruction/block_yield"
-require_relative "instruction/resolve_method"
-require_relative "instruction/truth_check"
-require_relative "instruction/not_same_check"
-require_relative "instruction/same_check"
-require_relative "instruction/jump"
-require_relative "instruction/return_jump"
-require_relative "instruction/slot_load"
-require_relative "instruction/return_sequence"
-require_relative "instruction/message_setup"
-require_relative "instruction/argument_transfer"
+require_relative "label"
+require_relative "check"
+require_relative "simple_call"
+require_relative "dynamic_call"
+require_relative "block_yield"
+require_relative "resolve_method"
+require_relative "truth_check"
+require_relative "not_same_check"
+require_relative "same_check"
+require_relative "jump"
+require_relative "return_jump"
+require_relative "slot_load"
+require_relative "return_sequence"
+require_relative "message_setup"
+require_relative "argument_transfer"
--- a/lib/slot_machine/instructions/jump.rb
+++ b/lib/slot_machine/instructions/jump.rb
--- a/lib/slot_machine/instructions/label.rb
+++ b/lib/slot_machine/instructions/label.rb
--- a/lib/slot_machine/instructions/message_setup.rb
+++ b/lib/slot_machine/instructions/message_setup.rb
--- a/lib/slot_machine/instructions/not_same_check.rb
+++ b/lib/slot_machine/instructions/not_same_check.rb
--- a/lib/slot_machine/instructions/resolve_method.rb
+++ b/lib/slot_machine/instructions/resolve_method.rb
--- a/lib/slot_machine/instructions/return_jump.rb
+++ b/lib/slot_machine/instructions/return_jump.rb
--- a/lib/slot_machine/instructions/return_sequence.rb
+++ b/lib/slot_machine/instructions/return_sequence.rb
--- a/lib/slot_machine/instructions/same_check.rb
+++ b/lib/slot_machine/instructions/same_check.rb
--- a/lib/slot_machine/instructions/simple_call.rb
+++ b/lib/slot_machine/instructions/simple_call.rb
--- a/lib/slot_machine/instructions/slot_load.rb
+++ b/lib/slot_machine/instructions/slot_load.rb
--- a/lib/slot_machine/instructions/truth_check.rb
+++ b/lib/slot_machine/instructions/truth_check.rb
--- a/lib/slot_machine/slot_machine.rb
+++ b/lib/slot_machine/slot_machine.rb
@ -17,7 +17,8 @@ require_relative "slot"
 require_relative "slotted_message"
 require_relative "slotted_constant"
 require_relative "slotted_object"
-require_relative "instruction"
+require_relative "basic_values"
+require_relative "instructions/instruction"
 require_relative "slot_collection"
 require_relative "callable_compiler"
 require_relative "method_compiler"
--- a/test/risc/instructions/test_instructions.rb
+++ b/test/risc/instructions/test_instructions.rb
--- a/test/slot_machine/instructions/helper.rb
+++ b/test/slot_machine/instructions/helper.rb
--- a/test/slot_machine/instructions/test_argument_transfer.rb
+++ b/test/slot_machine/instructions/test_argument_transfer.rb
--- a/test/slot_machine/instructions/test_block_yield.rb
+++ b/test/slot_machine/instructions/test_block_yield.rb
--- a/test/slot_machine/instructions/test_dynamic_call.rb
+++ b/test/slot_machine/instructions/test_dynamic_call.rb
--- a/test/slot_machine/instructions/test_jump.rb
+++ b/test/slot_machine/instructions/test_jump.rb
--- a/test/slot_machine/instructions/test_message_setup.rb
+++ b/test/slot_machine/instructions/test_message_setup.rb
--- a/test/slot_machine/instructions/test_not_same_check.rb
+++ b/test/slot_machine/instructions/test_not_same_check.rb
--- a/test/slot_machine/instructions/test_resolve_method.rb
+++ b/test/slot_machine/instructions/test_resolve_method.rb
--- a/test/slot_machine/instructions/test_return_jump.rb
+++ b/test/slot_machine/instructions/test_return_jump.rb
--- a/test/slot_machine/instructions/test_return_sequence.rb
+++ b/test/slot_machine/instructions/test_return_sequence.rb
--- a/test/slot_machine/instructions/test_simple_call.rb
+++ b/test/slot_machine/instructions/test_simple_call.rb
--- a/test/slot_machine/instructions/test_slot_load.rb
+++ b/test/slot_machine/instructions/test_slot_load.rb
--- a/test/slot_machine/instructions/test_slot_load1.rb
+++ b/test/slot_machine/instructions/test_slot_load1.rb
--- a/test/slot_machine/instructions/test_slot_load2.rb
+++ b/test/slot_machine/instructions/test_slot_load2.rb
--- a/test/slot_machine/instructions/test_slot_load3.rb
+++ b/test/slot_machine/instructions/test_slot_load3.rb
--- a/test/slot_machine/instructions/test_truth_check.rb
+++ b/test/slot_machine/instructions/test_truth_check.rb