From 54aa17c610ddc014bed5a501d5be508acb09317f Mon Sep 17 00:00:00 2001
From: Tom Browder <tom.browder@gmail.com>
Date: Mon, 11 Jun 2018 18:23:54 -0500
Subject: [PATCH] Prepare for Pod slang

+ add provision for Pod slang in Grammar.nqp

+ add separate files for PodAction.nqp and PodGrammar.nqp

+ modify build tools to provide for multiple, concatenated files for
  contents of final Grammar.nqp and Actions.nqp files
---
 src/Perl6/Grammar.nqp        | 1 +
 src/Perl6/PodActions.nqp     | 6 ++++++
 src/Perl6/PodGrammar.nqp     | 8 ++++++++
 tools/build/Makefile-JVM.in  | 7 +++++--
 tools/build/Makefile-Moar.in | 7 +++++--
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 src/Perl6/PodActions.nqp
 create mode 100644 src/Perl6/PodGrammar.nqp

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
index 239cb0ad59b..c6658d46dbf 100644
--- 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
new file mode 100644
index 00000000000..b601689761a
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..a4c85d8f61f
--- /dev/null
+++ 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
index f2b03a343d0..2a2496f229f 100644
--- 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
index 06c5cb8de55..4a07d3bdc64 100644
--- 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