aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common.mk28
-rw-r--r--test/yarp/iseq_test.rb30
2 files changed, 39 insertions, 19 deletions
diff --git a/common.mk b/common.mk
index d2ddcb8b58..a00d1dd59c 100644
--- a/common.mk
+++ b/common.mk
@@ -205,10 +205,25 @@ $(YARP_BUILD_DIR)/.time $(YARP_BUILD_DIR)/enc/.time $(YARP_BUILD_DIR)/util/.time
$(Q) $(MAKEDIRS) $(@D)
@$(NULLCMD) > $@
-main: $(srcdir)/lib/yarp/mutation_visitor.rb
-srcs: $(srcdir)/lib/yarp/mutation_visitor.rb
-$(srcdir)/lib/yarp/mutation_visitor.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/mutation_visitor.rb.erb
- $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/mutation_visitor.rb $(srcdir)/lib/yarp/mutation_visitor.rb
+main: $(srcdir)/lib/yarp/compiler.rb
+srcs: $(srcdir)/lib/yarp/compiler.rb
+$(srcdir)/lib/yarp/compiler.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/compiler.rb.erb
+ $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/compiler.rb $(srcdir)/lib/yarp/compiler.rb
+
+main: $(srcdir)/lib/yarp/dispatcher.rb
+srcs: $(srcdir)/lib/yarp/dispatcher.rb
+$(srcdir)/lib/yarp/dispatcher.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/dispatcher.rb.erb
+ $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/dispatcher.rb $(srcdir)/lib/yarp/dispatcher.rb
+
+main: $(srcdir)/lib/yarp/dsl.rb
+srcs: $(srcdir)/lib/yarp/dsl.rb
+$(srcdir)/lib/yarp/dsl.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/dsl.rb.erb
+ $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/dsl.rb $(srcdir)/lib/yarp/dsl.rb
+
+main: $(srcdir)/lib/yarp/mutation_compiler.rb
+srcs: $(srcdir)/lib/yarp/mutation_compiler.rb
+$(srcdir)/lib/yarp/mutation_compiler.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/mutation_compiler.rb.erb
+ $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/mutation_compiler.rb $(srcdir)/lib/yarp/mutation_compiler.rb
main: $(srcdir)/lib/yarp/node.rb
srcs: $(srcdir)/lib/yarp/node.rb
@@ -220,6 +235,11 @@ srcs: $(srcdir)/lib/yarp/serialize.rb
$(srcdir)/lib/yarp/serialize.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/serialize.rb.erb
$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/serialize.rb $(srcdir)/lib/yarp/serialize.rb
+main: $(srcdir)/lib/yarp/visitor.rb
+srcs: $(srcdir)/lib/yarp/visitor.rb
+$(srcdir)/lib/yarp/visitor.rb: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/lib/yarp/visitor.rb.erb
+ $(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb lib/yarp/visitor.rb $(srcdir)/lib/yarp/visitor.rb
+
srcs: yarp/api_node.c
yarp/api_node.c: $(YARP_SRCDIR)/config.yml $(YARP_SRCDIR)/templates/template.rb $(YARP_SRCDIR)/templates/ext/yarp/api_node.c.erb
$(Q) $(BASERUBY) $(YARP_SRCDIR)/templates/template.rb ext/yarp/api_node.c $@
diff --git a/test/yarp/iseq_test.rb b/test/yarp/iseq_test.rb
index f7998fe171..11d1b0572c 100644
--- a/test/yarp/iseq_test.rb
+++ b/test/yarp/iseq_test.rb
@@ -59,11 +59,11 @@ module YARP
############################################################################
def test_ClassVariableReadNode
- test_yarp_eval("class YARP::CompilerTest; @@yct = 1; @@yct; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = 1; @@yct; end")
end
def test_ConstantPathNode
- test_yarp_eval("YARP::CompilerTest")
+ test_yarp_eval("YARP::ISeqTest")
end
def test_ConstantReadNode
@@ -75,7 +75,7 @@ module YARP
end
def test_InstanceVariableReadNode
- test_yarp_eval("class YARP::CompilerTest; @yct = 1; @yct; end")
+ test_yarp_eval("class YARP::ISeqTest; @yct = 1; @yct; end")
end
def test_LocalVariableReadNode
@@ -87,24 +87,24 @@ module YARP
############################################################################
def test_ClassVariableTargetNode
- test_yarp_eval("class YARP::CompilerTest; @@yct, @@yct1 = 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct, @@yct1 = 1; end")
end
def test_ClassVariableWriteNode
- test_yarp_eval("class YARP::CompilerTest; @@yct = 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = 1; end")
end
def test_ClassVariableAndWriteNode
- test_yarp_eval("class YARP::CompilerTest; @@yct = 0; @@yct &&= 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = 0; @@yct &&= 1; end")
end
def test_ClassVariableOrWriteNode
- test_yarp_eval("class YARP::CompilerTest; @@yct = 1; @@yct ||= 0; end")
- test_yarp_eval("class YARP::CompilerTest; @@yct = nil; @@yct ||= 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = 1; @@yct ||= 0; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = nil; @@yct ||= 1; end")
end
def test_ClassVariableOperatorWriteNode
- test_yarp_eval("class YARP::CompilerTest; @@yct = 0; @@yct += 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @@yct = 0; @@yct += 1; end")
end
def test_ConstantTargetNode
@@ -180,11 +180,11 @@ module YARP
end
def test_InstanceVariableTargetNode
- test_yarp_eval("class YARP::CompilerTest; @yct, @yct1 = 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @yct, @yct1 = 1; end")
end
def test_InstanceVariableWriteNode
- test_yarp_eval("class YARP::CompilerTest; @yct = 1; end")
+ test_yarp_eval("class YARP::ISeqTest; @yct = 1; end")
end
def test_InstanceVariableAndWriteNode
@@ -224,8 +224,8 @@ module YARP
############################################################################
def test_EmbeddedVariableNode
- # test_yarp_eval('class YARP::CompilerTest; @yct = 1; "#@yct"; end')
- # test_yarp_eval('class YARP::CompilerTest; @@yct = 1; "#@@yct"; end')
+ # test_yarp_eval('class YARP::ISeqTest; @yct = 1; "#@yct"; end')
+ # test_yarp_eval('class YARP::ISeqTest; @@yct = 1; "#@@yct"; end')
test_yarp_eval('$yct = 1; "#$yct"')
end
@@ -262,7 +262,7 @@ module YARP
end
def test_StringConcatNode
- # test_yarp_eval('"YARP" "::" "CompilerTest"')
+ # test_yarp_eval('"YARP" "::" "ISeqTest"')
end
def test_StringNode
@@ -275,7 +275,7 @@ module YARP
def test_XStringNode
# test_yarp_eval(<<~RUBY)
- # class YARP::CompilerTest
+ # class YARP::ISeqTest
# def self.`(command) = command * 2
# `yct`
# end