Changeset fa36f29 in mainline for uspace/app/sbi/src/p_expr.c

Timestamp:

2010-02-27T17:59:14Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94d484a

Parents:

09ababb7

Message:

Update SBI to rev. 75.

File:

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

uspace/app/sbi/src/p_expr.c

@@ -34 +34 @@
 #include "list.h"
 #include "mytypes.h"
+#include "p_type.h"
 #include "parse.h"
 #include "stree.h"
@@ -42 +43 @@
 static stree_expr_t *parse_comparative(parse_t *parse);
 static stree_expr_t *parse_additive(parse_t *parse);
+static stree_expr_t *parse_prefix(parse_t *parse);
+static stree_expr_t *parse_prefix_new(parse_t *parse);
 static stree_expr_t *parse_postfix(parse_t *parse);
 static stree_expr_t *parse_pf_access(parse_t *parse, stree_expr_t *a);
@@ -48 +51 @@
 static stree_expr_t *parse_nameref(parse_t *parse);
 static stree_expr_t *parse_lit_int(parse_t *parse);
+static stree_expr_t *parse_lit_ref(parse_t *parse);
 static stree_expr_t *parse_lit_string(parse_t *parse);
+static stree_expr_t *parse_self_ref(parse_t *parse);
 
 /** Parse expression. */
@@ -130 +135 @@
         stree_binop_t *binop;
 
-        a = parse_postfix(parse);
+        a = parse_prefix(parse);
         while (lcur_lc(parse) == lc_plus) {
                 lskip(parse);
-                b = parse_postfix(parse);
+                b = parse_prefix(parse);
 
                 binop = stree_binop_new(bo_plus);
@@ -145 +150 @@
 
         return a;
+}
+
+/** Parse prefix expression. */
+static stree_expr_t *parse_prefix(parse_t *parse)
+{
+        stree_expr_t *a;
+
+        switch (lcur_lc(parse)) {
+        case lc_plus:
+                printf("Unimplemented: Unary plus.\n");
+                exit(1);
+        case lc_new:
+                a = parse_prefix_new(parse);
+                break;
+        default:
+                a = parse_postfix(parse);
+                break;
+        }
+
+        return a;
+}
+
+/** Parse @c new operator. */
+static stree_expr_t *parse_prefix_new(parse_t *parse)
+{
+        stree_texpr_t *texpr;
+        stree_new_t *new_op;
+        stree_expr_t *expr;
+
+        lmatch(parse, lc_new);
+        texpr = parse_texpr(parse);
+        lmatch(parse, lc_lparen);
+        lmatch(parse, lc_rparen);
+
+        new_op = stree_new_new();
+        new_op->texpr = texpr;
+        expr = stree_expr_new(ec_new);
+        expr->u.new_op = new_op;
+
+        return expr;
 }
 
@@ -240 +285 @@
                 expr = parse_lit_int(parse);
                 break;
+        case lc_nil:
+                expr = parse_lit_ref(parse);
+                break;
         case lc_lit_string:
                 expr = parse_lit_string(parse);
+                break;
+        case lc_self:
+                expr = parse_self_ref(parse);
                 break;
         default:
@@ -284 +335 @@
 }
 
+/** Parse reference literal (@c nil). */
+static stree_expr_t *parse_lit_ref(parse_t *parse)
+{
+        stree_literal_t *literal;
+        stree_expr_t *expr;
+
+        lmatch(parse, lc_nil);
+
+        literal = stree_literal_new(ltc_ref);
+
+        expr = stree_expr_new(ec_literal);
+        expr->u.literal = literal;
+
+        return expr;
+}
+
 /** Parse string literal. */
 static stree_expr_t *parse_lit_string(parse_t *parse)
@@ -302 +369 @@
         return expr;
 }
+
+/** Parse @c self keyword. */
+static stree_expr_t *parse_self_ref(parse_t *parse)
+{
+        stree_self_ref_t *self_ref;
+        stree_expr_t *expr;
+
+        lmatch(parse, lc_self);
+
+        self_ref = stree_self_ref_new();
+
+        expr = stree_expr_new(ec_self_ref);
+        expr->u.self_ref = self_ref;
+
+        return expr;
+}