Changeset 640ffe6 in mainline for uspace/app/sbi/src/p_type.c

Timestamp:

2010-05-08T08:15:57Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4039c77

Parents:

1317380 (diff), 051bc69a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/sysel. New: cspan printing, boolean ops, enums, constructors etc.

File:

• uspace/app/sbi/src/p_type.c (modified) (14 diffs)

uspace/app/sbi/src/p_type.c

@@ -31 +31 @@
 #include <assert.h>
 #include <stdlib.h>
+#include "cspan.h"
 #include "debug.h"
 #include "lex.h"
@@ -45 +46 @@
 static stree_texpr_t *parse_pf_taccess(parse_t *parse, stree_texpr_t *a);
 static stree_texpr_t *parse_pf_tindex(parse_t *parse, stree_texpr_t *a);
+static stree_texpr_t *parse_tparen(parse_t *parse);
 static stree_texpr_t *parse_tprimitive(parse_t *parse);
-static stree_tliteral_t *parse_tliteral(parse_t *parse);
-static stree_tnameref_t *parse_tnameref(parse_t *parse);
+static stree_texpr_t *parse_tliteral(parse_t *parse);
+static stree_texpr_t *parse_tnameref(parse_t *parse);
 
 static stree_texpr_t *parse_recovery_texpr(parse_t *parse);
@@ -91 +93 @@
         list_init(&tapply->targs);
 
+        targ = NULL;
+
         while (lcur_lc(parse) == lc_slash) {
 
@@ -104 +108 @@
         aexpr = stree_texpr_new(tc_tapply);
         aexpr->u.tapply = tapply;
+        tapply->texpr = aexpr;
+
+        if (targ != NULL)
+                aexpr->cspan = cspan_merge(gtype->cspan, targ->cspan);
+        else
+                aexpr->cspan = gtype->cspan;
+
         return aexpr;
 }
@@ -116 +127 @@
         stree_texpr_t *tmp;
 
-        a = parse_tprimitive(parse);
+        a = parse_tparen(parse);
 
         while (lcur_lc(parse) == lc_period || lcur_lc(parse) == lc_lsbr) {
@@ -162 +173 @@
         texpr = stree_texpr_new(tc_taccess);
         texpr->u.taccess = taccess;
+        taccess->texpr = texpr;
+        texpr->cspan = cspan_merge(a->cspan, ident->cspan);
 
         return texpr;
@@ -176 +189 @@
         stree_tindex_t *tindex;
         stree_expr_t *expr;
+        cspan_t *cs1;
 
         tindex = stree_tindex_new();
@@ -209 +223 @@
 
         lmatch(parse, lc_rsbr);
+        cs1 = lprev_span(parse);
 
         texpr = stree_texpr_new(tc_tindex);
         texpr->u.tindex = tindex;
-
-        return texpr;
-}
+        tindex->texpr = texpr;
+        texpr->cspan = cspan_merge(a->cspan, cs1);
+
+        return texpr;
+}
+
+/** Parse possibly partenthesized type expression.
+ *
+ * @param parse         Parser object.
+ */
+static stree_texpr_t *parse_tparen(parse_t *parse)
+{
+        stree_texpr_t *texpr;
+        cspan_t *cs0, *cs1;
+
+        if (lcur_lc(parse) == lc_lparen) {
+                cs0 = lcur_span(parse);
+                lskip(parse);
+                texpr = parse_texpr(parse);
+                lmatch(parse, lc_rparen);
+                cs1 = lprev_span(parse);
+                texpr->cspan = cspan_merge(cs0, cs1);
+        } else {
+                texpr = parse_tprimitive(parse);
+        }
+
+        return texpr;
+}
+
 
 /** Parse primitive type expression.
@@ -226 +267 @@
         switch (lcur_lc(parse)) {
         case lc_ident:
-                texpr = stree_texpr_new(tc_tnameref);
-                texpr->u.tnameref = parse_tnameref(parse);
+                texpr = parse_tnameref(parse);
                 break;
         case lc_bool:
@@ -234 +274 @@
         case lc_string:
         case lc_resource:
-                texpr = stree_texpr_new(tc_tliteral);
-                texpr->u.tliteral = parse_tliteral(parse);
+                texpr = parse_tliteral(parse);
                 break;
         default:
@@ -250 +289 @@
  * @param parse         Parser object.
  */
-static stree_tliteral_t *parse_tliteral(parse_t *parse)
+static stree_texpr_t *parse_tliteral(parse_t *parse)
 {
         stree_tliteral_t *tliteral;
         tliteral_class_t tlc;
+        stree_texpr_t *texpr;
 
         switch (lcur_lc(parse)) {
@@ -278 +318 @@
 
         tliteral = stree_tliteral_new(tlc);
-        return tliteral;
+        texpr = stree_texpr_new(tc_tliteral);
+        texpr->u.tliteral = tliteral;
+        tliteral->texpr = texpr;
+        texpr->cspan = lprev_span(parse);
+
+        return texpr;
 }
 
@@ -285 +330 @@
  * @param parse         Parser object.
  */
-static stree_tnameref_t *parse_tnameref(parse_t *parse)
+static stree_texpr_t *parse_tnameref(parse_t *parse)
 {
         stree_tnameref_t *tnameref;
+        stree_texpr_t *texpr;
 
         tnameref = stree_tnameref_new();
         tnameref->name = parse_ident(parse);
 
-        return tnameref;
+        texpr = stree_texpr_new(tc_tnameref);
+        texpr->u.tnameref = tnameref;
+        tnameref->texpr = texpr;
+        texpr->cspan = tnameref->name->cspan;
+
+        return texpr;
 }
 
@@ -310 +361 @@
         texpr = stree_texpr_new(tc_tliteral);
         texpr->u.tliteral = tliteral;
-
-        return texpr;
-}
+        tliteral->texpr = texpr;
+
+        return texpr;
+}