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

Timestamp:

2010-05-08T08:15:57Z (15 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/builtin/bi_textfile.c (modified) (4 diffs)

uspace/app/sbi/src/builtin/bi_textfile.c

@@ -71 +71 @@
                         "fun WriteLine(line : string), builtin;\n"
                         "\n"
-                        "prop EOF : int is\n"
+                        "prop EOF : bool is\n"
                                 "get is\n"
                                         "return is_eof();\n"
@@ -77 +77 @@
                         "end\n"
                         "\n"
-                        "fun is_eof() : int, builtin;\n"
+                        "fun is_eof() : bool, builtin;\n"
                 "end\n");
 
@@ -342 +342 @@
         rdata_var_t *self_f_var;
 
-        int eof_flag;
-        rdata_int_t *eof_int;
+        bool_t eof_flag;
+        rdata_bool_t *eof_bool;
         rdata_var_t *eof_var;
         rdata_value_t *eof_val;
@@ -362 +362 @@
         /* Get status of EOF flag. */
 
-        eof_flag = feof(file) ? 1 : 0;
-
-#ifdef DEBUG_RUN_TRACE
-        printf("Read EOF flag '%d'.\n", eof_flag);
+        eof_flag = feof(file) ? b_true : b_false;
+
+#ifdef DEBUG_RUN_TRACE
+        printf("Read EOF flag '%s'.\n", eof_flag ? "true" : "false");
 #endif
         /* Construct return value. */
-        eof_int = rdata_int_new();
-        bigint_init(&eof_int->value, eof_flag);
-
-        eof_var = rdata_var_new(vc_int);
-        eof_var->u.int_v = eof_int;
+        eof_bool = rdata_bool_new();
+        eof_bool->value = eof_flag;
+
+        eof_var = rdata_var_new(vc_bool);
+        eof_var->u.bool_v = eof_bool;
         eof_val = rdata_value_new();
         eof_val->var = eof_var;