Changes in uspace/app/sbi/src/p_expr.c [23de644:1ebc1a62] in mainline

File:

• uspace/app/sbi/src/p_expr.c (modified) (9 diffs)

uspace/app/sbi/src/p_expr.c

@@ -31 +31 @@
 #include <assert.h>
 #include <stdlib.h>
-#include "bigint.h"
 #include "debug.h"
 #include "lex.h"
@@ -45 +44 @@
 static stree_expr_t *parse_comparative(parse_t *parse);
 static stree_expr_t *parse_additive(parse_t *parse);
-static stree_expr_t *parse_multip(parse_t *parse);
 static stree_expr_t *parse_prefix(parse_t *parse);
 static stree_expr_t *parse_prefix_new(parse_t *parse);
@@ -53 +51 @@
 static stree_expr_t *parse_pf_index(parse_t *parse, stree_expr_t *a);
 static stree_expr_t *parse_pf_as(parse_t *parse, stree_expr_t *a);
-static stree_expr_t *parse_paren(parse_t *parse);
 static stree_expr_t *parse_primitive(parse_t *parse);
 static stree_expr_t *parse_nameref(parse_t *parse);
@@ -169 +166 @@
         stree_expr_t *a, *b, *tmp;
         stree_binop_t *binop;
-        binop_class_t bc;
-
-        a = parse_multip(parse);
-        while (lcur_lc(parse) == lc_plus || lcur_lc(parse) == lc_minus) {
+
+        a = parse_prefix(parse);
+        while (lcur_lc(parse) == lc_plus) {
                 if (parse_is_error(parse))
                         break;
 
-                switch (lcur_lc(parse)) {
-                case lc_plus: bc = bo_plus; break;
-                case lc_minus: bc = bo_minus; break;
-                default: assert(b_false);
-                }
-
                 lskip(parse);
-                b = parse_multip(parse);
-
-                binop = stree_binop_new(bc);
+                b = parse_prefix(parse);
+
+                binop = stree_binop_new(bo_plus);
                 binop->arg1 = a;
                 binop->arg2 = b;
@@ -197 +187 @@
 }
 
-/** Parse multiplicative expression.
- *
- * @param parse         Parser object.
- */
-static stree_expr_t *parse_multip(parse_t *parse)
-{
-        stree_expr_t *a, *b, *tmp;
-        stree_binop_t *binop;
-        binop_class_t bc;
-
-        a = parse_prefix(parse);
-        while (lcur_lc(parse) == lc_mult) {
-                if (parse_is_error(parse))
-                        break;
-
-                switch (lcur_lc(parse)) {
-                case lc_mult: bc = bo_mult; break;
-                default: assert(b_false);
-                }
-
-                lskip(parse);
-                b = parse_prefix(parse);
-
-                binop = stree_binop_new(bc);
-                binop->arg1 = a;
-                binop->arg2 = b;
-
-                tmp = stree_expr_new(ec_binop);
-                tmp->u.binop = binop;
-                a = tmp;
-        }
-
-        return a;
-}
-
 /** Parse prefix expression.
  *
@@ -239 +194 @@
 {
         stree_expr_t *a;
-        stree_expr_t *tmp;
-        stree_unop_t *unop;
-        unop_class_t uc;
 
         switch (lcur_lc(parse)) {
         case lc_plus:
-        case lc_minus:
-                if (parse_is_error(parse))
-                        return parse_recovery_expr(parse);
-
-                switch (lcur_lc(parse)) {
-                case lc_plus: uc = uo_plus; break;
-                case lc_minus: uc = uo_minus; break;
-                default: assert(b_false);
-                }
-
-                lskip(parse);
-                a = parse_postfix(parse);
-
-                unop = stree_unop_new(uc);
-                unop->arg = a;
-
-                tmp = stree_expr_new(ec_unop);
-                tmp->u.unop = unop;
-                a = tmp;
+                printf("Unimplemented: Unary plus.\n");
+                a = parse_recovery_expr(parse);
+                parse_note_error(parse);
                 break;
         case lc_new:
@@ -312 +248 @@
         stree_expr_t *tmp;
 
-        a = parse_paren(parse);
+        a = parse_primitive(parse);
 
         while (lcur_lc(parse) == lc_period || lcur_lc(parse) == lc_lparen ||
@@ -462 +398 @@
 }
 
-/** Parse possibly partenthesized expression.
- *
- * @param parse         Parser object.
- */
-static stree_expr_t *parse_paren(parse_t *parse)
-{
-        stree_expr_t *expr;
-
-        if (lcur_lc(parse) == lc_lparen) {
-                lskip(parse);
-                expr = parse_expr(parse);
-                lmatch(parse, lc_rparen);
-        } else {
-                expr = parse_primitive(parse);
-        }
-
-        return expr;
-}
-
-
 /** Parse primitive expression.
  *
@@ -543 +459 @@
 
         literal = stree_literal_new(ltc_int);
-        bigint_clone(&lcur(parse)->u.lit_int.value,
-            &literal->u.lit_int.value);
+        literal->u.lit_int.value = lcur(parse)->u.lit_int.value;
 
         lskip(parse);