Changeset 39e8406 in mainline for uspace/app/sbi/src/parse.c

Timestamp:

2010-03-20T21:57:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b535aeb

Parents:

6ba20a6b

Message:

Update SBI to rev. 128.

File:

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

uspace/app/sbi/src/parse.c

@@ -35 +35 @@
 #include <assert.h>
 #include <stdlib.h>
+#include "debug.h"
 #include "lex.h"
 #include "list.h"
@@ -133 +134 @@
         csi = stree_csi_new(cc);
         csi->name = parse_ident(parse);
-/*
+
+#ifdef DEBUG_PARSE_TRACE
         printf("parse_csi: csi=%p, csi->name = %p (%s)\n", csi, csi->name,
             strtab_get_str(csi->name->sid));
-*/
+#endif
         if (lcur_lc(parse) == lc_colon) {
                 /* Inheritance list */
@@ -193 +195 @@
                 symbol->outer_csi = outer_csi;
                 fun->symbol = symbol;
+                fun->proc->outer_symbol = symbol;
                 break;
         case lc_var:
@@ -213 +216 @@
                 symbol->outer_csi = outer_csi;
                 prop->symbol = symbol;
+                if (prop->getter)
+                        prop->getter->outer_symbol = symbol;
+                if (prop->setter)
+                        prop->setter->outer_symbol = symbol;
                 break;
         default:
@@ -235 +242 @@
         lmatch(parse, lc_lparen);
 
+#ifdef DEBUG_PARSE_TRACE
+        printf("Parsing function '%s'.\n", strtab_get_str(fun->name->sid));
+#endif
+
         list_init(&fun->args);
 
@@ -242 +253 @@
                 while (b_true) {
                         arg = parse_proc_arg(parse);
+
                         if (stree_arg_has_attr(arg, aac_packed)) {
                                 fun->varg = arg;
@@ -266 +278 @@
 
         lmatch(parse, lc_is);
-        fun->body = parse_block(parse);
+        fun->proc = stree_proc_new();
+        fun->proc->body = parse_block(parse);
         lmatch(parse, lc_end);
 
@@ -342 +355 @@
                         lskip(parse);
                         lmatch(parse, lc_is);
-                        if (prop->getter_body != NULL) {
+                        if (prop->getter != NULL) {
                                 printf("Error: Duplicate getter.\n");
                                 exit(1);
                         }
-                        prop->getter_body = parse_block(parse);
+
+                        /* Create setter procedure */
+                        prop->getter = stree_proc_new();
+                        prop->getter->body = parse_block(parse);
+
                         lmatch(parse, lc_end);
                         break;
                 case lc_set:
                         lskip(parse);
-                        prop->setter_arg_name = parse_ident(parse);
+                        prop->setter_arg = stree_proc_arg_new();
+                        prop->setter_arg->name = parse_ident(parse);
+                        prop->setter_arg->type = prop->type;
                         lmatch(parse, lc_is);
-                        if (prop->setter_body != NULL) {
+                        if (prop->setter != NULL) {
                                 printf("Error: Duplicate setter.\n");
                                 exit(1);
                         }
-                        prop->setter_body = parse_block(parse);
+
+                        /* Create setter procedure */
+                        prop->setter = stree_proc_new();
+                        prop->setter->body = parse_block(parse);
+
                         lmatch(parse, lc_end);
                         break;
@@ -390 +413 @@
         }
 
+#ifdef DEBUG_PARSE_TRACE
+        printf("Parsed arg attr, type=%p.\n", arg->type);
+#endif
         return arg;
 }