annotate comparison subexpressions in AlexTemplate

GTE() and EQ() were getting the following errors for the
monadUserState-strict-text and possibly other cases with
-XImpredicativeTypes enabled:

basic_typeclass.i.hs:877:28: error: [GHC-36495]
    • tagToEnum# must appear applied to one value argument
    • In the first argument of ‘(&&)’, namely
        ‘(GHC.Exts.tagToEnum# (offset >=# 0#))’
      In the expression:
        (GHC.Exts.tagToEnum# (offset >=# 0#))
          &&
            let check = alexIndexInt16OffAddr alex_check offset
            in (GHC.Exts.tagToEnum# (check ==# ord_c))
      In the expression:
        if (GHC.Exts.tagToEnum# (offset >=# 0#))
             &&
               let check = alexIndexInt16OffAddr alex_check offset
               in (GHC.Exts.tagToEnum# (check ==# ord_c)) then
            alexIndexInt16OffAddr alex_table offset
        else
            alexIndexInt16OffAddr alex_deflt s
    |
877 |                 new_s = if GTE(offset,ILIT(0))
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Annotating the tagToEnum# usage to specify which Enum is intended was
one case. Another was annotating the results of ==# and >=# to resolve
some ambiguity involved there.

Author: NadiaYvette

data/AlexTemplate.hs

@@ -13,12 +13,16 @@
 #  define FAST_INT Int#
 -- Do not remove this comment. Required to fix CPP parsing when using GCC and a clang-compiled alex.
 #  if __GLASGOW_HASKELL__ > 706
-#    define GTE(n,m) (GHC.Exts.tagToEnum# (n >=# m))
-#    define EQ(n,m) (GHC.Exts.tagToEnum# (n ==# m))
+#    define CMP_GEQ(n,m) (((n) >=# (m)) :: Int#)
+#    define CMP_EQ(n,m) (((n) ==# (m)) :: Int#)
+#    define CMP_MKBOOL(x) ((GHC.Exts.tagToEnum# (x)) :: Bool)
 #  else
-#    define GTE(n,m) (n >=# m)
-#    define EQ(n,m) (n ==# m)
+#    define CMP_GEQ(n,m) (((n) >= (m)) :: Bool)
+#    define CMP_EQ(n,m) (((n) == (m)) :: Bool)
+#    define CMP_MKBOOL(x) ((x) :: Bool)
 #  endif
+#  define GTE(n,m) CMP_MKBOOL(CMP_GEQ(n,m))
+#  define EQ(n,m) CMP_MKBOOL(CMP_EQ(n,m))
 #  define PLUS(n,m) (n +# m)
 #  define MINUS(n,m) (n -# m)
 #  define TIMES(n,m) (n *# m)