Changeset 883fedc in mainline for uspace/app/sbi/src/rdata.c

Timestamp:

2010-04-23T23:09:56Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37c9fc8

Parents:

80badbe (diff), 6c39a907 (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: generic classes, autoboxing, delegates.

File:

• uspace/app/sbi/src/rdata.c (modified) (2 diffs)

uspace/app/sbi/src/rdata.c

@@ -529 +529 @@
 static void rdata_deleg_copy(rdata_deleg_t *src, rdata_deleg_t **dest)
 {
-        (void) src; (void) dest;
-        printf("Unimplemented: Copy delegate.\n");
-        exit(1);
+        *dest = rdata_deleg_new();
+        (*dest)->obj = src->obj;
+        (*dest)->sym = src->sym;
 }
 
@@ -711 +711 @@
                 break;
         case vc_ref:
-                printf("ref(");
-                rdata_var_print(var->u.ref_v->vref);
-                printf(")");
+                if (var->u.ref_v->vref != NULL) {
+                        printf("ref(");
+                        rdata_var_print(var->u.ref_v->vref);
+                        printf(")");
+                } else {
+                        printf("nil");
+                }
                 break;
         case vc_deleg:
                 printf("deleg(");
-                if (var->u.deleg_v->obj != NULL) {
-                        rdata_var_print(var->u.deleg_v->obj);
-                        printf(",");
+                if (var->u.deleg_v->sym != NULL) {
+                        if (var->u.deleg_v->obj != NULL) {
+                                rdata_var_print(var->u.deleg_v->obj);
+                                printf(",");
+                        }
+                        symbol_print_fqn(var->u.deleg_v->sym);
+                } else {
+                        printf("nil");
                 }
-                symbol_print_fqn(var->u.deleg_v->sym);
                 printf(")");
                 break;