xo-reader2 stack: support op<=

src/reader2/DApplySsm.cpp

@@ -158,7 +158,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DDefineSsm.cpp

@@ -533,7 +533,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DDeftypeSsm.cpp

@@ -138,7 +138,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DExpectExprSsm.cpp

@@ -179,7 +179,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DExpectFormalArgSsm.cpp

@@ -122,7 +122,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DExpectFormalArglistSsm.cpp

@@ -153,7 +153,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_doublecolon:

src/reader2/DExpectListTypeSsm.cpp

@@ -114,7 +114,7 @@ namespace xo {
             case tokentype::tk_rightparen:
             case tokentype::tk_leftbracket:
             case tokentype::tk_rightbracket:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DExpectQArraySsm.cpp

@@ -110,7 +110,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_doublecolon:

src/reader2/DExpectQListSsm.cpp

@@ -110,7 +110,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_doublecolon:

src/reader2/DExpectQLiteralSsm.cpp

@@ -128,7 +128,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_doublecolon:

src/reader2/DExpectSymbolSsm.cpp

@@ -88,7 +88,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DExpectTypeSsm.cpp

@@ -91,7 +91,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DIfElseSsm.cpp

@@ -173,7 +173,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DLambdaSsm.cpp

@@ -151,7 +151,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DParenSsm.cpp

@@ -119,7 +119,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DProgressSsm.cpp

@@ -134,7 +134,7 @@ namespace xo {
                     return optype::op_not_equal;
                 case tokentype::tk_leftangle:    // [<]
                     return optype::op_less;
-                case tokentype::tk_lessequal:
+                case tokentype::tk_cmple:        // [<=]
                     return optype::op_less_equal;
                 case tokentype::tk_rightangle:
                     return optype::op_great;
@@ -291,7 +291,6 @@ namespace xo {
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftbrace:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_doublecolon:
@@ -306,6 +305,7 @@ namespace xo {
             case tokentype::tk_cmpeq:
             case tokentype::tk_cmpne:
             case tokentype::tk_leftangle:
+            case tokentype::tk_cmple:
                 this->on_operator_token(tk, p_psm);
                 return;
 
@@ -1163,6 +1163,12 @@ namespace xo {
                      lhs_, rhs_);
 
             case optype::op_less_equal:
+                return assemble_numeric_expr_aux
+                    (p_psm->expr_alloc(),
+                     TypeRef::prefix_type::from_chars("_cmple_gco"),
+                     p_psm->cmple_pm(),
+                     lhs_, rhs_);
+
             case optype::op_great:
             case optype::op_great_equal:
                 assert(false);
@@ -1175,7 +1181,6 @@ namespace xo {
                      p_psm->multiply_pm(), //&NumericPrimitives::s_mul_gco_gco_pm
                      lhs_, rhs_);
 
-                break;
             case optype::op_divide:
                 return assemble_numeric_expr_aux
                     (p_psm->expr_alloc(),
@@ -1183,42 +1188,6 @@ namespace xo {
                      p_psm->divide_pm(), // &NumericPrimitives::s_div_gco_gco_pm
                      lhs_, rhs_);
 
-#ifdef OBSOLETE
-                {
-                    auto pm_obj  = (with_facet<AGCObject>::mkobj
-                                    (&NumericPrimitives::s_div_gco_gco_pm));
-                    auto fn_expr = (DConstant::make
-                                    (p_psm->expr_alloc(), pm_obj));
-
-                    /* note:
-                     * 1. don't assume we know lhs_ / rhs_ value types yet.
-                     *    perhaps have expression like
-                     *      f(..) * g(..)
-                     *    where f is the function that contains current ssm.
-                     *
-                     * 2. consequence: we need representation for
-                     *    polymorphic multiply on unknown numeric arguments.
-                     *
-                     * 3. TypeRef::dwim(..) is a placeholder.
-                     *    Plan to later provide abstract interpreter
-                     *    (ie compiler pass :) to drive type inference/unification
-                     *
-                     * 4. Alternatively could supply type-annotation syntax
-                     *    so human can assist inference; context here is we want
-                     *    to automate the boring stuff
-                     */
-
-                    TypeRef tref = TypeRef::dwim
-                                       (TypeRef::prefix_type::from_chars("_div_gco"),
-                                        nullptr);
-
-                    return DApplyExpr::make2(p_psm->expr_alloc(),
-                                             tref, fn_expr, lhs_, rhs_);
-                }
-#endif
-
-                break;
-
             case optype::op_add:
                 return assemble_numeric_expr_aux
                     (p_psm->expr_alloc(),
@@ -1268,26 +1237,6 @@ namespace xo {
                      p_psm->subtract_pm(),
                      lhs_, rhs_);
 
-#ifdef OBSOLETE
-                {
-                    auto pm_obj = (with_facet<AGCObject>::mkobj
-                                       (&NumericPrimitives::s_sub_gco_gco_pm));
-                    auto fn_expr = (DConstant::make
-                                        (p_psm->expr_alloc(), pm_obj));
-
-                    // see comment on op_multiply re need for poly impl
-
-                    TypeRef tref = TypeRef::dwim
-                                       (TypeRef::prefix_type::from_chars("_sub_gco"),
-                                        nullptr);
-
-                    return DApplyExpr::make2(p_psm->expr_alloc(),
-                                             tref, fn_expr, lhs_, rhs_);
-                }
-#endif
-
-                break;
-
 #ifdef NOT_YET
 case optype::op_assign:
     {

src/reader2/DQuoteSsm.cpp

@@ -120,7 +120,7 @@ namespace xo {
             case tokentype::tk_rightbracket:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DSequenceSsm.cpp

@@ -101,7 +101,7 @@ namespace xo {
             case tokentype::tk_leftbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma:

src/reader2/DToplevelSeqSsm.cpp

@@ -174,7 +174,7 @@ namespace xo {
             case tokentype::tk_rightbrace:
             case tokentype::tk_leftangle:
             case tokentype::tk_rightangle:
-            case tokentype::tk_lessequal:
+            case tokentype::tk_cmple:
             case tokentype::tk_greatequal:
             case tokentype::tk_dot:
             case tokentype::tk_comma: