Changeset 37f527b in mainline for uspace/app/sbi/src/ancr.c

Timestamp:

2010-03-26T21:55:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4204ad9

Parents:

b535aeb

Message:

Update SBI to rev. 144.

File:

• uspace/app/sbi/src/ancr.c (modified) (4 diffs)

uspace/app/sbi/src/ancr.c

@@ -50 +50 @@
 #include <stdlib.h>
 #include <assert.h>
+#include "builtin.h"
 #include "list.h"
 #include "mytypes.h"
@@ -120 +121 @@
         stree_symbol_t *base_sym;
         stree_csi_t *base_csi, *outer_csi;
+        stree_csi_t *gf_class;
 
         if (node->ancr_state == ws_visited) {
@@ -137 +139 @@
 
         outer_csi = csi_to_symbol(node)->outer_csi;
+        gf_class = builtin_get_gf_class(prog->builtin);
 
         /* Process outer CSI */
@@ -151 +154 @@
                 /* Process base CSI. */
                 ancr_csi_process(prog, base_csi);
+        } else if (node != gf_class) {
+                /* Implicit inheritance from grandfather class. */
+                base_csi = gf_class;
         } else {
+                /* Grandfather class has no base class. */
                 base_csi = NULL;
         }