From 5ee0ddd064ce0b35c4bf18093f8b23c49f0da850 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Mon, 22 Aug 2022 15:29:40 -0400
Subject: [PATCH] core: list2typedef: Include proper package namespace prefixes

Required by yet-to-be-committed TAMER grammar.

DEV-7145
---
 build-aux/Makefile.am            | 2 +-
 build-aux/list2typedef           | 2 ++
 build-aux/test/test-list2typedef | 2 ++
 core/alias.xml                   | 1 +
 core/assert.xml                  | 1 +
 core/cond.xml                    | 1 +
 core/dummy.xml                   | 1 +
 core/extern.xml                  | 1 +
 core/numeric/boolean.xml         | 1 +
 core/tdat.xml                    | 1 +
 core/test/spec.xml               | 2 --
 core/vector/convert.xml          | 1 +
 core/vector/count.xml            | 1 +
 13 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index af4c6966..698736d4 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -197,7 +197,7 @@ c1map: $(dest_c1map)
 %.xml: %.dat rater/core/tdat.xmlo rater/tools/tdat2xml
 	rater/tools/tdat2xml $< > $@
 
-%.xml: %.typelist
+%.xml: %.typelist rater/tame/build-aux/list2typedef
 	rater/tame/build-aux/list2typedef $(*F) < $< > $@
 
 %.csvo: %.csvm rater/tools/csvm2csv
diff --git a/build-aux/list2typedef b/build-aux/list2typedef
index d19c3689..350df8cd 100755
--- a/build-aux/list2typedef
+++ b/build-aux/list2typedef
@@ -150,6 +150,8 @@ main()
   cat <<EOF
 <?xml version="1.0"?>
 <package xmlns="http://www.lovullo.com/rater"
+         xmlns:c="http://www.lovullo.com/calc"
+         xmlns:t="http://www.lovullo.com/rater/apply-template"
          title="$typedef Type">
   <typedef name="$typedef" desc="$typedef">
     <enum type="integer">
diff --git a/build-aux/test/test-list2typedef b/build-aux/test/test-list2typedef
index 21e4a596..9f967ad7 100755
--- a/build-aux/test/test-list2typedef
+++ b/build-aux/test/test-list2typedef
@@ -38,6 +38,8 @@ Second'\''s @     @Line
 
   declare -r expected='<?xml version="1.0"?>
 <package xmlns="http://www.lovullo.com/rater"
+         xmlns:c="http://www.lovullo.com/calc"
+         xmlns:t="http://www.lovullo.com/rater/apply-template"
          title="FooType Type">
   <typedef name="FooType" desc="FooType">
     <enum type="integer">
diff --git a/core/alias.xml b/core/alias.xml
index a2bb1a68..d5e855df 100644
--- a/core/alias.xml
+++ b/core/alias.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
          xmlns:c="http://www.lovullo.com/calc"
+         xmlns:t="http://www.lovullo.com/rater/apply-template"
          core="true"
          desc="Aliasing Values">
 
diff --git a/core/assert.xml b/core/assert.xml
index 16853392..6a5e1e79 100644
--- a/core/assert.xml
+++ b/core/assert.xml
@@ -18,6 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <package xmlns="http://www.lovullo.com/rater"
+         xmlns:c="http://www.lovullo.com/calc"
          xmlns:t="http://www.lovullo.com/rater/apply-template"
          core="true"
          desc="Assertions">
diff --git a/core/cond.xml b/core/cond.xml
index a85ccbda..ca8adfb6 100644
--- a/core/cond.xml
+++ b/core/cond.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
+  xmlns:t="http://www.lovullo.com/rater/apply-template"
   core="true"
   desc="Generic conditionals">
 
diff --git a/core/dummy.xml b/core/dummy.xml
index e752dd33..10af0de6 100644
--- a/core/dummy.xml
+++ b/core/dummy.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
          xmlns:c="http://www.lovullo.com/calc"
+         xmlns:t="http://www.lovullo.com/rater/apply-template"
          core="true"
          title="Dummy Values">
 
diff --git a/core/extern.xml b/core/extern.xml
index cc61132a..d190d356 100644
--- a/core/extern.xml
+++ b/core/extern.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
          xmlns:c="http://www.lovullo.com/calc"
+         xmlns:t="http://www.lovullo.com/rater/apply-template"
          core="true"
          desc="Extern Definition">
 
diff --git a/core/numeric/boolean.xml b/core/numeric/boolean.xml
index ac8f6178..9c2fa4fd 100644
--- a/core/numeric/boolean.xml
+++ b/core/numeric/boolean.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
+  xmlns:t="http://www.lovullo.com/rater/apply-template"
   core="true"
   desc="Numeric computations dealing with boolean algebra">
 
diff --git a/core/tdat.xml b/core/tdat.xml
index 8797597f..b0de277a 100644
--- a/core/tdat.xml
+++ b/core/tdat.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
+  xmlns:t="http://www.lovullo.com/rater/apply-template"
   core="true"
   desc="Territory data support (used in conjunction with tdat script)">
 
diff --git a/core/test/spec.xml b/core/test/spec.xml
index e9b17728..6dbe928f 100644
--- a/core/test/spec.xml
+++ b/core/test/spec.xml
@@ -49,8 +49,6 @@
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:t="http://www.lovullo.com/rater/apply-template"
   xmlns:c="http://www.lovullo.com/calc"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.lovullo.com/rater ../../rater.xsd"
 
   core="true"
 
diff --git a/core/vector/convert.xml b/core/vector/convert.xml
index ea9996ba..e1599edd 100644
--- a/core/vector/convert.xml
+++ b/core/vector/convert.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
+  xmlns:t="http://www.lovullo.com/rater/apply-template"
   core="true"
   desc="Convert vectors into other types">
 
diff --git a/core/vector/count.xml b/core/vector/count.xml
index 3bd0e909..b19e68bf 100644
--- a/core/vector/count.xml
+++ b/core/vector/count.xml
@@ -19,6 +19,7 @@
 -->
 <package xmlns="http://www.lovullo.com/rater"
   xmlns:c="http://www.lovullo.com/calc"
+  xmlns:t="http://www.lovullo.com/rater/apply-template"
   core="true"
   desc="Vector element counting">