Merge pull request #1914 from tbrowder/grammar-concat

Prepare for upcoming Pod slang
rakudo · Jun 12, 2018 · 61ca55d · 61ca55d
2 parents 20bf96f + 54aa17c
commit 61ca55d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -481,6 +481,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         self.define_slang('Quote',   Perl6::QGrammar,       Perl6::QActions);
         self.define_slang('Regex',   Perl6::RegexGrammar,   Perl6::RegexActions);
         self.define_slang('P5Regex', Perl6::P5RegexGrammar, Perl6::P5RegexActions);
+        self.define_slang('Pod',     Perl6::PodGrammar,     Perl6::PodActions);
 
         # Old language braid, going away eventually
         # XXX TODO: if these are going out, be sure to make similar change

diff --git a/src/Perl6/PodActions.nqp b/src/Perl6/PodActions.nqp
@@ -0,0 +1,6 @@
+# This file is not stand-alone as it is part of another file: it will
+# be concatenated with src/Perl6/Actions.nqp during the build process.
+
+# place holder for a new slang for Pod
+class Perl6::PodActions is Perl6::Actions does STDActions {
+}
diff --git a/src/Perl6/PodGrammar.nqp b/src/Perl6/PodGrammar.nqp
@@ -0,0 +1,8 @@
+# This file is not stand-alone as it is part of another file: it will
+# be concatenated with src/Perl6/Grammar.nqp during the build process.
+
+# place holder for a new slang for Pod
+grammar Perl6::PodGrammar is Perl6::Grammar does STD does MatchPackageNibbler {
+}
+
+# vim: ft=perl6 et sw=4
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -110,13 +110,16 @@ $(PERL6_P_JAR): src/Perl6/Pod.nqp gen/nqp-version
 	    src/Perl6/Pod.nqp
 
 $(PERL6_A_JAR): src/Perl6/Actions.nqp $(PERL6_P_JAR) $(PERL6_OPS_JAR)
-	$(J_NQP) $(J_GEN_CAT) src/Perl6/Actions.nqp > $(J_BUILD_DIR)/Perl6-Actions.nqp
+	$(J_NQP) $(J_GEN_CAT) src/Perl6/Actions.nqp \
+                              src/Perl6/PodActions.nqp > $(J_BUILD_DIR)/Perl6-Actions.nqp
 	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_A_JAR) --encoding=utf8 \
 	    $(J_BUILD_DIR)/Perl6-Actions.nqp
 
 $(PERL6_G_JAR): src/Perl6/Grammar.nqp $(PERL6_W_JAR) $(PERL6_A_JAR) $(PERL6_P_JAR)
+	$(J_NQP) $(J_GEN_CAT) src/Perl6/Grammar.nqp \
+                              src/Perl6/PodGrammar.nqp > $(J_BUILD_DIR)/Perl6-Grammar.nqp
 	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_G_JAR) --encoding=utf8 \
-	    src/Perl6/Grammar.nqp
+	    $(J_BUILD_DIR)/Perl6-Grammar.nqp
 
 $(PERL6_O_JAR): src/Perl6/Optimizer.nqp $(PERL6_OPS_JAR)
 	$(J_NQP) $(J_GEN_CAT) src/Perl6/Optimizer.nqp > $(J_BUILD_DIR)/Perl6-Optimizer.nqp

diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
@@ -133,13 +133,16 @@ $(PERL6_P_MOAR): src/Perl6/Pod.nqp gen/nqp-version
 	    src/Perl6/Pod.nqp
 
 $(PERL6_A_MOAR): src/Perl6/Actions.nqp $(PERL6_P_MOAR) $(PERL6_OPS_MOAR)
-	$(M_NQP) $(M_GEN_CAT) src/Perl6/Actions.nqp > $(M_BUILD_DIR)/Perl6-Actions.nqp
+	$(M_NQP) $(M_GEN_CAT) src/Perl6/Actions.nqp \
+                              src/Perl6/PodActions.nqp > $(M_BUILD_DIR)/Perl6-Actions.nqp
 	$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_A_MOAR) --encoding=utf8 \
 	    $(M_BUILD_DIR)/Perl6-Actions.nqp
 
 $(PERL6_G_MOAR): src/Perl6/Grammar.nqp $(PERL6_W_MOAR) $(PERL6_A_MOAR) $(PERL6_P_MOAR)
+	$(M_NQP) $(M_GEN_CAT) src/Perl6/Grammar.nqp \
+                              src/Perl6/PodGrammar.nqp > $(M_BUILD_DIR)/Perl6-Grammar.nqp
 	$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_G_MOAR) --encoding=utf8 \
-	    src/Perl6/Grammar.nqp
+	    $(M_BUILD_DIR)/Perl6-Grammar.nqp
 
 $(PERL6_O_MOAR): src/Perl6/Optimizer.nqp $(PERL6_OPS_MOAR)
 	$(M_NQP) $(M_GEN_CAT) src/Perl6/Optimizer.nqp > $(M_BUILD_DIR)/Perl6-Optimizer.nqp