Changeset 863

Timestamp:

Jun 22, 2003, 10:51:01 AM (18 years ago)

Author:

orlov

Message:

• Use Term::cast_to() instead of Term::get_object() and dynamic_cast.

Location:

to-imperative/trunk/library

Files:

• Box/get.cc (modified) (1 diff)
• Box/put.cc (modified) (1 diff)
• StdIO/open_file.cc (modified) (2 diffs)
• StdIO/print_e_.cc (modified) (1 diff)
• StdIO/write_e_.cc (modified) (1 diff)

to-imperative/trunk/library/Box/get.cc

@@ -16 +16 @@
   if (_box.get_len() == 1) {
     Term* t = _box.get_first();
-    if (t->get_type() == type_box) {
-      try {
-        rftype::Box& b = dynamic_cast<rftype::Box&>(t->get_object());
-        _expr = b.get();
-      } catch (std::bad_cast&) {
-        FATAL("Box::?(): An object does not seem to be a box");
-      }
+    rftype::Box* b = t->cast_to<rftype::Box>(type_box);
+    if (b) {
+        _expr = b->get();
     } else {
       FATAL("Box::?(): Symbol does not have a box type");

to-imperative/trunk/library/Box/put.cc

@@ -16 +16 @@
   if (_box.get_len() == 1) {
     Term* t = _box.get_first();
-    if (t->get_type() == type_box) {
-      try {
-        rftype::Box& b = dynamic_cast<rftype::Box&>(t->get_object());
-        b.put(_expr);
-      } catch (std::bad_cast&) {
-        FATAL("Box::Store(): An object does not seem to be a box");
-      }
+    rftype::Box* b = t->cast_to<rftype::Box>(type_box);
+    if (b) {
+        b->put(_expr);
     } else {
       FATAL("Box::Store(): Symbol does not have a box type");

to-imperative/trunk/library/StdIO/open_file.cc

@@ -26 +26 @@
   if (_channel.get_len() == 1) {
     Term* p = _channel.get_first();
-    if (p->get_type() == type_object) {
-      Channel& ch = dynamic_cast<Channel&>(p->get_object());
+    Channel* ch = p->cast_to<Channel>(type_channel);
+    if (ch) {
       if (_mode.get_len() == 1) {
         Term* p = _mode.get_first();
@@ -40 +40 @@
           wcstombs(mode, ws.get_data(), len + 1);
           mode[len] = 0;
-          if (!ch.open(fname, mode)) {
+          if (!ch->open(fname, mode)) {
             throw Word::create_expr(L"Open-File") +
               Word::create_expr(strerror(errno));

to-imperative/trunk/library/StdIO/print_e_.cc

@@ -16 +16 @@
   if (_channel.get_len() == 1) {
     Term* p = _channel.get_first();
-    if (p->get_type() == type_object) {
-      Channel& ch = dynamic_cast<Channel&>(p->get_object());
-      FILE* fp = ch.get_fp();
+    Channel* ch = p->cast_to<Channel>(type_channel);
+    if (ch) {
+      FILE* fp = ch->get_fp();
       if (fp == NULL) {
         throw Word::create_expr(L"Print!") +

to-imperative/trunk/library/StdIO/write_e_.cc

@@ -17 +17 @@
   if (_channel.get_len() == 1) {
     Term* p = _channel.get_first();
-    if (p->get_type() == type_object) {
-      Channel& ch = dynamic_cast<Channel&>(p->get_object());
-      FILE* fp = ch.get_fp();
+    Channel* ch = p->cast_to<Channel>(type_channel);
+    if (ch) {
+      FILE* fp = ch->get_fp();
       if (fp == NULL) {
         throw Word::create_expr(L"Write!") +