core: list2typedef: Include proper package namespace prefixes

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

DEV-7145
main
Mike Gerwitz 2022-08-22 15:29:40 -04:00
parent 8a286878f6
commit 5ee0ddd064
13 changed files with 14 additions and 3 deletions

View File

@ -197,7 +197,7 @@ c1map: $(dest_c1map)
%.xml: %.dat rater/core/tdat.xmlo rater/tools/tdat2xml %.xml: %.dat rater/core/tdat.xmlo rater/tools/tdat2xml
rater/tools/tdat2xml $< > $@ rater/tools/tdat2xml $< > $@
%.xml: %.typelist %.xml: %.typelist rater/tame/build-aux/list2typedef
rater/tame/build-aux/list2typedef $(*F) < $< > $@ rater/tame/build-aux/list2typedef $(*F) < $< > $@
%.csvo: %.csvm rater/tools/csvm2csv %.csvo: %.csvm rater/tools/csvm2csv

View File

@ -150,6 +150,8 @@ main()
cat <<EOF cat <<EOF
<?xml version="1.0"?> <?xml version="1.0"?>
<package xmlns="http://www.lovullo.com/rater" <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"> title="$typedef Type">
<typedef name="$typedef" desc="$typedef"> <typedef name="$typedef" desc="$typedef">
<enum type="integer"> <enum type="integer">

View File

@ -38,6 +38,8 @@ Second'\''s @ @Line
declare -r expected='<?xml version="1.0"?> declare -r expected='<?xml version="1.0"?>
<package xmlns="http://www.lovullo.com/rater" <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"> title="FooType Type">
<typedef name="FooType" desc="FooType"> <typedef name="FooType" desc="FooType">
<enum type="integer"> <enum type="integer">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Aliasing Values"> desc="Aliasing Values">

View File

@ -18,6 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template" xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Assertions"> desc="Assertions">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Generic conditionals"> desc="Generic conditionals">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
title="Dummy Values"> title="Dummy Values">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Extern Definition"> desc="Extern Definition">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Numeric computations dealing with boolean algebra"> desc="Numeric computations dealing with boolean algebra">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Territory data support (used in conjunction with tdat script)"> desc="Territory data support (used in conjunction with tdat script)">

View File

@ -49,8 +49,6 @@
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:t="http://www.lovullo.com/rater/apply-template" xmlns:t="http://www.lovullo.com/rater/apply-template"
xmlns:c="http://www.lovullo.com/calc" 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" core="true"

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Convert vectors into other types"> desc="Convert vectors into other types">

View File

@ -19,6 +19,7 @@
--> -->
<package xmlns="http://www.lovullo.com/rater" <package xmlns="http://www.lovullo.com/rater"
xmlns:c="http://www.lovullo.com/calc" xmlns:c="http://www.lovullo.com/calc"
xmlns:t="http://www.lovullo.com/rater/apply-template"
core="true" core="true"
desc="Vector element counting"> desc="Vector element counting">