employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

core: Remove `const/@type` 

This has been optional for many years and is not actually used by the
current compiler.  TAMER can infer it, in situations where it actually
matters in the future.

So, rather than adding support for this in the new parser, let's clean up.

DEV-7145
main
Mike Gerwitz 2022-08-15 10:18:30 -04:00
parent 709291b107
commit 9f98cbf9b4
16 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/cond.xml
View File

@ -35,7 +35,7 @@
<c:case>
<c:when name="or_a">
<c:eq>
<c:const value="0" type="integer" desc="Return B if A is 0" />
<c:const value="0" desc="Return B if A is 0" />
</c:eq>
</c:when>
@ -65,7 +65,7 @@
<param-value name="@name@" />
</param>
<c:const value="@value@" type="@type@" desc="@desc@">
<c:const value="@value@" desc="@desc@">
<!-- TODO: non-index option -->
<c:when name="@name@" index="@index@">
<c:eq>
@ -86,14 +86,14 @@
<if name="@index@">
<c:when name="@name@" index="@index@">
<c:gt>
<c:const value="0" type="integer" desc="Use override if greater than 0" />
<c:const value="0" desc="Use override if greater than 0" />
</c:gt>
</c:when>
</if>
<unless name="@index@">
<c:when name="@name@">
<c:gt>
<c:const value="0" type="integer" desc="Use override if greater than 0" />
<c:const value="0" desc="Use override if greater than 0" />
</c:gt>
</c:when>
</unless>
@ -122,11 +122,11 @@
<c:case>
<c:when name="@name@" index="@index@">
<c:eq>
<c:const value="0" type="integer" desc="No value" />
<c:const value="0" desc="No value" />
</c:eq>
</c:when>
<c:const value="@default@" type="integer" desc="Default value" />
<c:const value="@default@" desc="Default value" />
</c:case>
<c:otherwise>
@ -155,7 +155,7 @@
<c:value-of name="@value@" />
</if>
<unless name="@value@">
<c:const value="@const@" type="float" desc="@desc@" />
<c:const value="@const@" desc="@desc@" />
</unless>
<!-- if this is not provided, then the c:product will be optimized away -->

4
core/datetime.xml
View File

@ -94,7 +94,7 @@
<c:value-of name="@default@" index="k" />
</if>
<unless name="@default@">
<c:const value="0" type="integer" desc="Condition not met, but no default" />
<c:const value="0" desc="Condition not met, but no default" />
</unless>
</c:case>
</if>
@ -105,7 +105,7 @@
<c:case>
<c:when name="@yearset@" index="k">
<c:gt>
<c:const value="0" type="integer" desc="Only calculate difference if a value is available" />
<c:const value="0" desc="Only calculate difference if a value is available" />
</c:gt>
</c:when>

2
core/map.xml
View File

@ -68,7 +68,7 @@
<unless name="@default@" eq="">
<c:otherwise>
<c:const value="@default@" type="integer" desc="No mapping" />
<c:const value="@default@" desc="No mapping" />
</c:otherwise>
</unless>
</c:cases>

4
core/numeric/boolean.xml
View File

@ -28,10 +28,10 @@
<function name="not" desc="Negates a boolean value" sym="\lnot">
<param name="not_value" type="boolean" desc="Boolean value to negate" />
<c:const value="1" type="boolean" desc="Value of 1 if given value is zero">
<c:const value="1" desc="Value of 1 if given value is zero">
<c:when name="not_value">
<c:eq>
<c:const value="0" type="boolean" desc="Value to assert against for returning 1" />
<c:const value="0" desc="Value to assert against for returning 1" />
</c:eq>
</c:when>
</c:const>

22
core/numeric/minmax.xml
View File

@ -79,7 +79,7 @@
<c:apply name="max" label="@label@">
<c:arg name="max1">
<c:const value="0" type="integer" desc="Do not allow a value under 0" />
<c:const value="0" desc="Do not allow a value under 0" />
</c:arg>
<c:arg name="max2">
@ -135,7 +135,7 @@
<c:arg name="min1">
<!-- deprecated -->
<if name="@value@">
<c:const value="@value@" type="float" desc="@desc@" />
<c:const value="@value@" desc="@desc@" />
</if>
<unless name="@value@">
<c:value-of name="@name@"
@ -162,7 +162,7 @@
<c:apply name="max" label="{@label@}, minimum of 1">
<c:arg name="max1">
<c:const value="@min@" type="float" desc="Minimum value" />
<c:const value="@min@" desc="Minimum value" />
</c:arg>
<c:arg name="max2">
@ -179,10 +179,10 @@
<param name="@desc@" desc="Description" />
<c:gte>
<c:const value="@min@" type="float" desc="{@desc@}; minimum" />
<c:const value="@min@" desc="{@desc@}; minimum" />
</c:gte>
<c:lte>
<c:const value="@max@" type="float" desc="{@desc@}; maximum" />
<c:const value="@max@" desc="{@desc@}; maximum" />
</c:lte>
</template>
@ -238,7 +238,7 @@
</c:when>
<!-- just return the value provided -->
<c:const value="0" type="float" desc="Zero value" />
<c:const value="0" desc="Zero value" />
</c:case>
</if>
@ -266,8 +266,8 @@
</unless>
<c:quotient label="Percent as real number">
<c:const value="@percent@" type="integer" desc="Whole percent" />
<c:const value="100" type="integer" desc="Divisor to convert percent to real number" />
<c:const value="@percent@" desc="Whole percent" />
<c:const value="100" desc="Divisor to convert percent to real number" />
</c:quotient>
</if>
@ -279,7 +279,7 @@
</unless>
<if name="@const@">
<c:const value="@const@" type="float" desc="Constant minimum value" />
<c:const value="@const@" desc="Constant minimum value" />
</if>
</c:value>
</c:values>
@ -305,8 +305,8 @@
</unless>
<c:quotient label="Max percent as real number">
<c:const value="@maxpercent@" type="integer" desc="Whole max percent" />
<c:const value="100" type="integer" desc="Divisor to convert max percent to real number" />
<c:const value="@maxpercent@" desc="Whole max percent" />
<c:const value="100" desc="Divisor to convert max percent to real number" />
</c:quotient>
</c:product>
</c:value>

4
core/numeric/percent.xml
View File

@ -132,11 +132,11 @@
<c:value-of name="@name@" index="@index@" />
</if>
<unless name="@name@">
<c:const value="@value@" type="float" desc="@desc@" />
<c:const value="@value@" desc="@desc@" />
</unless>
</c:product>
<c:const value="100" type="integer" desc="Convert to rational number" />
<c:const value="100" desc="Convert to rational number" />
</c:quotient>
</c:sum>
</template>

18
core/numeric/round.xml
View File

@ -42,8 +42,8 @@
<c:arg name="round_real_n">
<c:expt>
<c:const value="10" type="integer" desc="Decimal base" />
<c:const value="@precision@" type="integer" desc="Exponent" />
<c:const value="10" desc="Decimal base" />
<c:const value="@precision@" desc="Exponent" />
</c:expt>
</c:arg>
</c:apply>
@ -111,7 +111,7 @@
desc="Exponential/step divisor">
<c:product>
<c:expt>
<c:const value="10" type="integer"
<c:const value="10"
desc="Decimal base" />
<c:value-of name="@exp@" />
</c:expt>
@ -196,7 +196,7 @@
<c:floor>
<c:sum>
<c:value-of name="roundval" />
<c:const value="0.5" type="float" desc="Raises value in a manner that it can be properly rounded by a floor" />
<c:const value="0.5" desc="Raises value in a manner that it can be properly rounded by a floor" />
</c:sum>
</c:floor>
</function>
@ -229,7 +229,7 @@
<c:apply name="round_real">
<c:arg name="round_real_n">
<c:const value="100" type="integer" desc="Round to the nearest 100th" />
<c:const value="100" desc="Round to the nearest 100th" />
</c:arg>
<c:arg name="round_real_val">
@ -248,15 +248,15 @@
<c:quotient>
<param-copy name="@values@" />
<c:expt>
<c:const value="10" type="integer" desc="Decimal base" />
<c:const value="@digits@" type="integer" desc="Number of digits" />
<c:const value="10" desc="Decimal base" />
<c:const value="@digits@" desc="Number of digits" />
</c:expt>
</c:quotient>
</c:ceil>
<c:expt>
<c:const value="10" type="integer" desc="Decimal base" />
<c:const value="@digits@" type="integer" desc="Number of digits" />
<c:const value="10" desc="Decimal base" />
<c:const value="@digits@" desc="Number of digits" />
</c:expt>
</c:product>
</template>

2
core/tdat.xml
View File

@ -37,7 +37,7 @@
<rate-each class="@class@" yields="@yields@" generates="@generates@" index="k">
<c:const value="@code@" type="integer" desc="Territory code" />
<c:const value="@code@" desc="Territory code" />
</rate-each>
</template>
</package>

4
core/test/core/vector/interpolate.xml
View File

@ -171,7 +171,7 @@
step="INTERP_TABLE_STEP"
actual="#300">
<t:where-eq field="pred">
<c:const value="31" type="float"
<c:const value="31"
desc="Test predicate value" />
</t:where-eq>
</t:interpolate-query-field>
@ -221,7 +221,7 @@
step="INTERP_TABLE_STEP"
actual="#350">
<t:where-eq field="pred">
<c:const value="31" type="float"
<c:const value="31"
desc="Test predicate value" />
</t:where-eq>
</t:interpolate-query-field>

2
core/vector/cmatch.xml
View File

@ -241,7 +241,7 @@
<match on="@on@">
<dyn-node name="c:{@cmp@}">
<if name="@const@">
<c:const value="@const@" type="float" desc="Comparison" />
<c:const value="@const@" desc="Comparison" />
</if>
<unless name="@const@">

4
core/vector/common.xml
View File

@ -136,7 +136,7 @@
</c:gte>
</c:when>
<c:const value="-1" type="integer" desc="Not found" />
<c:const value="-1" desc="Not found" />
</c:case>
@ -199,7 +199,7 @@
<!-- generates a variable that can be recognized as an empty set (useful for
defaults to params that require sets) -->
<rate-each class="always" yields="__empty" generates="__emptySet" index="k">
<c:const value="0" type="integer" desc="Nothing" />
<c:const value="0" desc="Nothing" />
</rate-each>
</package>

4
core/vector/count.xml
View File

@ -30,7 +30,7 @@
<param name="count_set" type="integer" set="vector" desc="Vector to count" />
<c:sum of="count_set" index="k">
<c:const value="1" type="integer" desc="Add 1 for each value in the set" />
<c:const value="1" desc="Add 1 for each value in the set" />
</c:sum>
</function>
@ -51,7 +51,7 @@
</c:apply>
<!-- ensure the equation is not undefined if length = 0 -->
<c:const value="1" type="integer" desc="Add 1 to ensure equation is always defined" />
<c:const value="1" desc="Add 1 to ensure equation is always defined" />
</c:sum>
</c:quotient>
</c:ceil>

6
core/vector/interpolate.xml
View File

@ -57,7 +57,7 @@
<c:value name="b" type="float" desc="Second set value">
<c:value-of name="orig_set">
<c:index>
<c:const value="1" type="integer" desc="Second index" />
<c:const value="1" desc="Second index" />
</c:index>
</c:value-of>
</c:value>
@ -110,14 +110,14 @@
<c:case>
<c:when name="step">
<c:eq>
<c:const value="0" type="integer" desc="No step indicates identical values" />
<c:const value="0" desc="No step indicates identical values" />
</c:eq>
</c:when>
<!-- just return the first value; it's exact and no interpolation is necessary -->
<c:value-of name="set">
<c:index>
<c:const value="0" type="integer" desc="First index" />
<c:const value="0" desc="First index" />
</c:index>
</c:value-of>
</c:case>

2
core/vector/list.xml
View File

@ -73,7 +73,7 @@
<c:case>
<c:when name="__valn">
<c:eq>
<c:const value="0" type="integer" desc="When there are no more elements in the set" />
<c:const value="0" desc="When there are no more elements in the set" />
</c:eq>
</c:when>

4
core/vector/minmax.xml
View File

@ -189,7 +189,7 @@
</c:eq>
</c:when>
<c:const value="0" type="integer" desc="No value" />
<c:const value="0" desc="No value" />
</c:case>
<!-- we have values; perform reduction -->
@ -287,7 +287,7 @@
<c:arg name="_maxreduce_i">
<c:sum>
<c:value-of name="_maxreduce_i" />
<c:const value="-1" type="integer" desc="Decrement index by 1" />
<c:const value="-1" desc="Decrement index by 1" />
</c:sum>
</c:arg>
</c:apply>

12
core/vector/table.xml
View File

@ -418,7 +418,7 @@
<c:vector label="Conditional for {@field@}">
<!-- the first element will represent the column (field) index -->
<unless name="@name@">
<c:const value="@id@" type="integer" desc="Field index" />
<c:const value="@id@" desc="Field index" />
</unless>
<if name="@name@">
<c:value-of name="@name@" />
@ -431,7 +431,7 @@
<!-- the third element will represent whether or not this field is sequential -->
<if name="@sequential@">
<c:const value="@sequential@" type="boolean" desc="Whether data is sequential" />
<c:const value="@sequential@" desc="Whether data is sequential" />
</if>
<unless name="@sequential@">
<!-- if a field name was given, we can get the sequential information
@ -538,7 +538,7 @@
<c:value-of name="i" />
</c:index>
<c:index>
<c:const value="0" type="integer" desc="Field id" />
<c:const value="0" desc="Field id" />
</c:index>
</c:value-of>
</c:arg>
@ -550,7 +550,7 @@
<c:value-of name="i" />
</c:index>
<c:index>
<c:const value="1" type="integer" desc="Field value" />
<c:const value="1" desc="Field value" />
</c:index>
</c:value-of>
</c:arg>
@ -562,7 +562,7 @@
<c:value-of name="i" />
</c:index>
<c:index>
<c:const value="2" type="integer" desc="Sequential flag" />
<c:const value="2" desc="Sequential flag" />
</c:index>
</c:value-of>
</c:arg>
@ -574,7 +574,7 @@
<c:value-of name="i" />
</c:index>
<c:index>
<c:const value="3" type="integer" desc="Comparison operator" />
<c:const value="3" desc="Comparison operator" />
</c:index>
</c:value-of>
</c:arg>