renaming mom builtin to macro

lib/mom/macro.rb

@@ -9,12 +9,14 @@ module Mom
       end
     end
   end
+  class Macro < Instruction
+  end
 end
 
-require_relative "builtin/space"
+require_relative "macro/space"
-require_relative "builtin/integer"
+require_relative "macro/integer"
-require_relative "builtin/object"
+require_relative "macro/object"
-require_relative "builtin/word"
+require_relative "macro/word"
 
 module Mom
   module Builtin

lib/mom/macro/comparison.rb

@@ -29,7 +29,7 @@ module Mom
       end
     end
   end
-  class Comparison < ::Mom::Instruction
+  class Comparison < Macro
     attr_reader :operator
     def initialize(name , operator)
       super(name)

lib/mom/macro/div10.rb

@@ -62,7 +62,7 @@ module Mom
       end
     end
   end
-  class Div10 < ::Mom::Instruction
+  class Div10 < Macro
     def to_risc(compiler)
       s = "div_10 "
       builder = compiler.builder(compiler.source)

lib/mom/macro/div4.rb

@@ -16,7 +16,7 @@ module Mom
       end
     end
   end
-  class Div4 < ::Mom::Instruction
+  class Div4 < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       integer_tmp = builder.allocate_int

lib/mom/macro/exit.rb

@@ -9,7 +9,7 @@ module Mom
       end
     end
   end
-  class Exit < ::Mom::Instruction
+  class Exit < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       builder.prepare_int_return # makes integer_tmp variable as return

lib/mom/macro/get_internal_byte.rb

@@ -16,7 +16,7 @@ module Mom
       end
     end
   end
-  class GetInternalByte < ::Mom::Instruction
+  class GetInternalByte < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       integer_tmp = builder.allocate_int

lib/mom/macro/get_internal_word.rb

@@ -12,7 +12,7 @@ module Mom
       end
     end
   end
-  class GetInternalWord < Instruction
+  class GetInternalWord < Macro
     def to_risc(compiler)
       compiler.builder(compiler.source).build do
         object! << message[:receiver]

lib/mom/macro/init.rb

@@ -32,7 +32,7 @@ module Mom
       end
     end
   end
-  class Init < ::Mom::Instruction
+  class Init < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       builder.build do

lib/mom/macro/method_missing.rb

@@ -9,7 +9,7 @@ module Mom
       end
     end
   end
-  class MethodMissing < ::Mom::Instruction
+  class MethodMissing < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       builder.prepare_int_return # makes integer_tmp variable as return

lib/mom/macro/operator.rb

@@ -24,7 +24,7 @@ module Mom
       end
     end
   end
-  class IntOperator < Instruction
+  class IntOperator < Macro
     attr_reader :operator
     def initialize(name , operator)
       super(name)

lib/mom/macro/putstring.rb

@@ -13,7 +13,7 @@ module Mom
       end
     end
   end
-  class Putstring < ::Mom::Instruction
+  class Putstring < Macro
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       builder.prepare_int_return # makes integer_tmp variable as return

lib/mom/macro/set_internal_byte.rb

@@ -15,7 +15,7 @@ module Mom
       end
     end
   end
-  class SetInternalByte < ::Mom::Instruction
+  class SetInternalByte < Macro
     def to_risc(compiler)
       compiler.builder(compiler.source).build do
         word! << message[:receiver]

lib/mom/macro/set_internal_word.rb

@@ -14,7 +14,7 @@ module Mom
       end
     end
   end
-  class SetInternalWord < ::Mom::Instruction
+  class SetInternalWord < Macro
     def to_risc(compiler)
       compiler.builder(compiler.source).build do
         object! << message[:receiver]

lib/mom/mom.rb

@@ -23,4 +23,4 @@ require_relative "mom_collection"
 require_relative "callable_compiler"
 require_relative "method_compiler"
 require_relative "block_compiler"
-require_relative "builtin"
+require_relative "macro"

lib/vool/builtin.rb

@@ -1,5 +1,5 @@
 module Vool
-  module Builtin
+  module Macro
     def self.boot_methods(options)
       return if options[:boot_methods] == false
       load_builtin( :int_plus )

lib/vool/yield_statement.rb

@@ -39,7 +39,7 @@ module Vool
       check = Mom::NotSameCheck.new(compile_method , runtime_method, ok_label)
       # TODO? Maybe create mom instructions for this
       #builder = compiler.builder("yield")
-      #Risc::Builtin.exit_sequence(builder)
+      #Risc::Macro.exit_sequence(builder)
       #check << builder.built
       check << ok_label
     end

test/risc/interpreter/builtin/test_int_cmp.rb

@@ -2,7 +2,7 @@ require_relative "../helper"
 
 # TODO move these to interpreter dir
 module Risc
-  module Builtin
+  module Macro
     class IntCmp < Minitest::Test
       include Ticker
       def setup

test/risc/interpreter/builtin/test_int_math.rb

@@ -1,7 +1,7 @@
 require_relative "../helper"
 
 module Risc
-  module Builtin
+  module Macro
     class IntMath < Minitest::Test
       include Ticker
       def setup

test/rubyx/macro/helper.rb

@@ -1,7 +1,7 @@
 require_relative "../helper"
 
 module RubyX
-  module BuiltinHelper
+  module MacroHelper
     def setup
       whole ="class Space;def main(arg);return;end;end;" + source
       @mom = RubyXCompiler.new(RubyX.default_test_options).ruby_to_mom(whole)

test/rubyx/macro/test_integer_comparison.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestIntegerSame < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def op ; :== ; end
       def len ; 25 ; end
       def source

test/rubyx/macro/test_integer_div10.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestIntegerDiv10 < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Integer

test/rubyx/macro/test_integer_div4.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestIntegerDiv4 < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Integer

test/rubyx/macro/test_integer_operator.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestIntegerPlus < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def op ; :+ ; end
       def source
         <<GET

test/rubyx/macro/test_object_exit.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestObjectExit < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Object

test/rubyx/macro/test_object_get.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestObjectGet < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Object

test/rubyx/macro/test_object_init.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestObjectInit < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Object

test/rubyx/macro/test_object_missing.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestObjectMissing < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Space

test/rubyx/macro/test_object_set.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestObjectGet < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Object

test/rubyx/macro/test_word_get.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestWordGet < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Word

test/rubyx/macro/test_word_putstring.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestWordPutstring < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Word

test/rubyx/macro/test_word_set.rb

@@ -1,9 +1,9 @@
 require_relative "helper"
 
 module RubyX
-  module Builtin
+  module Macro
     class TestWordSet < MiniTest::Test
-      include BuiltinHelper
+      include MacroHelper
       def source
         <<GET
         class Word

test/vool/test_builtin.rb

@@ -6,7 +6,7 @@ module Vool
 
     def setup
       Parfait.boot!(Parfait.default_test_options)
-      @code = Builtin.boot_methods({})
+      @code = Macro.boot_methods({})
     end
     def as_ruby
       @ruby = Ruby::RubyCompiler.compile(@code)