From 00f46b0032f2706546e29b2dd90e37ce51fe3b56 Mon Sep 17 00:00:00 2001
From: Brandon Ellis <brandon.ellis@ryansg.com>
Date: Wed, 21 Sep 2022 11:59:06 -0400
Subject: [PATCH] [DEV-12990] Add gt, gte, lt, lte operators to if/unless

This includes updating Tamer's parser to account for the new
operator possibilities.
---
 src/current/include/preproc/template.xsl | 55 ++++++++++++++++++++++++
 tamer/src/nir/parse.rs                   |  8 ++++
 tamer/src/xir/st.rs                      |  4 ++
 3 files changed, 67 insertions(+)

diff --git a/src/current/include/preproc/template.xsl b/src/current/include/preproc/template.xsl
index 6c9ce049..1e525066 100644
--- a/src/current/include/preproc/template.xsl
+++ b/src/current/include/preproc/template.xsl
@@ -823,6 +823,61 @@
   </if>
 </template>
 
+<template match="lv:*[@gt]" mode="preproc:apply-template-cmp" priority="5">
+  <param name="negate" select="false()" />
+  <param name="param-value" />
+  <param name="cmp-value" />
+
+  <if test="
+      ( ( $negate = 'true' ) and not( $param-value &gt; $cmp-value ) )
+      or ( ( $negate = 'false' ) and ( $param-value &gt; $cmp-value ) )
+    ">
+
+    <apply-templates select="*" mode="preproc:apply-template" />
+  </if>
+</template>
+
+<template match="lv:*[@gte]" mode="preproc:apply-template-cmp" priority="5">
+  <param name="negate" select="false()" />
+  <param name="param-value" />
+  <param name="cmp-value" />
+
+  <if test="
+      ( ( $negate = 'true' ) and not( $param-value &gt;= $cmp-value ) )
+      or ( ( $negate = 'false' ) and ( $param-value &gt;= $cmp-value ) )
+    ">
+
+    <apply-templates select="*" mode="preproc:apply-template" />
+  </if>
+</template>
+
+<template match="lv:*[@lt]" mode="preproc:apply-template-cmp" priority="5">
+  <param name="negate" select="false()" />
+  <param name="param-value" />
+  <param name="cmp-value" />
+
+  <if test="
+      ( ( $negate = 'true' ) and not( $param-value &lt; $cmp-value ) )
+      or ( ( $negate = 'false' ) and ( $param-value &lt; $cmp-value ) )
+    ">
+
+    <apply-templates select="*" mode="preproc:apply-template" />
+  </if>
+</template>
+
+<template match="lv:*[@lte]" mode="preproc:apply-template-cmp" priority="5">
+  <param name="negate" select="false()" />
+  <param name="param-value" />
+  <param name="cmp-value" />
+
+  <if test="
+      ( ( $negate = 'true' ) and not( $param-value &lt;= $cmp-value ) )
+      or ( ( $negate = 'false' ) and ( $param-value &lt;= $cmp-value ) )
+    ">
+
+    <apply-templates select="*" mode="preproc:apply-template" />
+  </if>
+</template>
 
 <template mode="preproc:apply-template-cmp" priority="5"
               match="lv:*[ @prefix ]">
diff --git a/tamer/src/nir/parse.rs b/tamer/src/nir/parse.rs
index 2298863c..1a5ab0d0 100644
--- a/tamer/src/nir/parse.rs
+++ b/tamer/src/nir/parse.rs
@@ -1837,6 +1837,10 @@ ele_parse! {
         @ {
             _name: (QN_NAME) => TplParamIdent,
             _eq: (QN_EQ?) => Option<StringLiteral>,
+            _gt: (QN_GT?) => Option<NumLiteral>,
+            _gte: (QN_GTE?) => Option<NumLiteral>,
+            _lt: (QN_LT?) => Option<NumLiteral>,
+            _lte: (QN_LTE?) => Option<NumLiteral>,
             _prefix: (QN_PREFIX?) => Option<StringLiteral>,
             _suffix: (QN_SUFFIX?) => Option<StringLiteral>,
         } => Nir::Todo,
@@ -1853,6 +1857,10 @@ ele_parse! {
         @ {
             _name: (QN_NAME) => TplParamIdent,
             _eq: (QN_EQ?) => Option<StringLiteral>,
+            _gt: (QN_GT?) => Option<NumLiteral>,
+            _gte: (QN_GTE?) => Option<NumLiteral>,
+            _lt: (QN_LT?) => Option<NumLiteral>,
+            _lte: (QN_LTE?) => Option<NumLiteral>,
             _prefix: (QN_PREFIX?) => Option<StringLiteral>,
             _suffix: (QN_SUFFIX?) => Option<StringLiteral>,
         } => Nir::Todo,
diff --git a/tamer/src/xir/st.rs b/tamer/src/xir/st.rs
index 91046501..65f2ff37 100644
--- a/tamer/src/xir/st.rs
+++ b/tamer/src/xir/st.rs
@@ -139,6 +139,8 @@ pub mod qname {
         QN_GENERATES: :L_GENERATES,
         QN_GENSYM: :L_GENSYM,
         QN_GENTLE_NO: :L_GENTLE_NO,
+        QN_GT: :L_GT,
+        QN_GTE: :L_GTE,
         QN_ID: :L_ID,
         QN_IDENTIFIER: :L_IDENTIFIER,
         QN_IF: :L_IF,
@@ -152,6 +154,8 @@ pub mod qname {
         QN_LABEL: :L_LABEL,
         QN_LOCAL: :L_LOCAL,
         QN_LOWER: :L_LOWER,
+        QN_LT: :L_LT,
+        QN_LTE: :L_LTE,
         QN_LV_IMPORT: L_LV:L_IMPORT,
         QN_LV_PACKAGE: L_LV:L_PACKAGE,
         QN_L_DEP: L_L:L_DEP,