From 4ff84133d2bb04ddd0ac242656500ae8089cb271 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Fri, 2 Nov 2018 15:54:30 -0700
Subject: [PATCH] add append to MomCompiler

also lazy init boot_function, so that compilers can be added up
before going to translate, where the boot_compilers are used
---
 lib/mom/mom_compiler.rb       | 36 ++++++++++++++++++++++++++++++++---
 test/mom/test_mom_compiler.rb | 13 +++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/lib/mom/mom_compiler.rb b/lib/mom/mom_compiler.rb
index ad1e9001..8f4020f3 100644
--- a/lib/mom/mom_compiler.rb
+++ b/lib/mom/mom_compiler.rb
@@ -1,14 +1,44 @@
 module Mom
+  # The Compiler for the Mom level is a collection of Risc level Method compilers,
+  # plus functions to translate from the risc to cpu specific code.
+  #
+  # Builtin functions are created here, lazily, when translate is called.
+  # Instantiating builtin functions results in a MethodCompiler for that function, and
+  # to avoid confusion, these should be instantiated only once.
+  #
+  # As RubyCompiler pools source at the vool level, when several classes are compiled
+  # from vool to mom, several MomCompilers get instantiated. They must be merged before
+  # proceeding with translate. Thus we have a append method.
+  #
   class MomCompiler
     attr_reader :method_compilers
 
+    # Initialize with an array of risc MethodCompilers
     def initialize(compilers = [])
-      @method_compilers = compilers + Risc::Builtin.boot_functions
+      @method_compilers = compilers
+    end
+
+    # lazily instantiate the compilers for boot functions
+    # (in the hope of only booting the functions once)
+    def boot_compilers
+      @boot_compilers ||= Risc::Builtin.boot_functions
+    end
+
+    # Return all compilers, namely the MethodCompilers passed in, plus the
+    # boot_function's compilers (boot_compilers)
+    def compilers
+      @method_compilers + boot_compilers
     end
 
     # collects constants from all compilers into one array
     def constants
-      @method_compilers.inject([]){|sum ,comp| sum + comp.constants }
+      compilers.inject([]){|sum ,comp| sum + comp.constants }
+    end
+
+    # Append another MomCompilers method_compilers to this one.
+    def append(mom_compiler)
+      @method_compilers += mom_compiler.method_compilers
+      self
     end
 
     # Translate code to whatever cpu is specified.
@@ -25,7 +55,7 @@ module Mom
 
     # go through all methods and translate them to cpu, given the translator
     def translate_methods(translator)
-      method_compilers.collect do |compiler|
+      compilers.collect do |compiler|
         #log.debug "Translate method #{compiler.method.name}"
         translate_method(compiler , translator)
       end.flatten
diff --git a/test/mom/test_mom_compiler.rb b/test/mom/test_mom_compiler.rb
index cde86ca6..5a501df9 100644
--- a/test/mom/test_mom_compiler.rb
+++ b/test/mom/test_mom_compiler.rb
@@ -13,10 +13,13 @@ module Mom
       assert_equal MomCompiler , @comp.class
     end
     def test_compilers
-      assert_equal 23 , @comp.method_compilers.length
+      assert_equal 23 , @comp.compilers.length
+    end
+    def test_boot_compilers
+      assert_equal 22 , @comp.boot_compilers.length
     end
     def test_compilers_bare
-      assert_equal 22 , MomCompiler.new.method_compilers.length
+      assert_equal 22 , MomCompiler.new.compilers.length
     end
     def test_returns_constants
       assert_equal Array , @comp.constants.class
@@ -27,5 +30,11 @@ module Mom
     def test_has_translate
       assert @comp.translate(:interpreter)
     end
+    def test_append_class
+      assert_equal MomCompiler,  (@comp.append @comp).class
+    end
+    def test_append_length
+      assert_equal 2 ,  @comp.append(@comp).method_compilers.length
+    end
   end
 end