Changeset 1773

Timestamp:

Jun 9, 2005, 7:29:51 AM (16 years ago)

Author:

orlov

Message:

• A lot of runtime changes towards interfaces simplification.

Location:

to-imperative/trunk

Files:

• compiler/rfp_asail.rf (modified) (1 diff)
• library/Box/Box.cc (modified) (1 diff)
• library/Box/get.cc (modified) (3 diffs)
• library/Box/store.cc (modified) (2 diffs)
• library/Class/box_q.cc (modified) (1 diff)
• library/Dir/Makefile (modified) (1 diff)
• library/Dir/dir_symbol.cc (added)
• library/Dir/file_list (modified) (1 diff)
• library/Lexer/Lexer.cc (modified) (1 diff)
• library/Static/Static.cc (modified) (1 diff)
• library/StdIO/prim_open_file.cc (modified) (2 diffs)
• library/Stream/Stream.cc (modified) (1 diff)
• library/Stream/StreamErr.cc (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail.rf

@@ -173 +173 @@
       <RFP-Extract-Qualifiers t.name> :: (e.qualifiers) e.name,
       <Rfp2Cpp e.name> :: e.cpp-name,
-      <Put &Const-Exprs (e.cpp-name
-        ('new rftype::StaticObject<rftype::' s1 <To-Lower e2> '>(L"'e.name'")'))>,
+      {
+        s.tag : BOX =
+          <Put &Const-Exprs (e.cpp-name
+            ('Expr::create_sym< NamedObject<BoxContents> >(L"'e.name'")'))>;
+        <Put &Const-Exprs (e.cpp-name
+          ('new rftype::StaticObject<rftype::' s1 <To-Lower e2> '>(L"'e.name'")'))>;
+      },
       <Namespace-Control e.qualifiers>
       (e.linkage 'Expr ' e.cpp-name ';');

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

@@ -15 +15 @@
 
 RF_FUNC (Box, (RF_ARG _e;;), (RF_RES _box;;))
-  _box = Expr::create<rftype::Box>(_e);
+  _box = Expr::create_sym<BoxContents>(Expr(_e));
 RF_END
 

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

@@ -1 +1 @@
 #include <rf_core.hh>
-
-#include <typeinfo>
-
-using namespace rfrt;
 
 namespace refal
 {
+
+using namespace rfrt;
 
 namespace Box
@@ -16 +14 @@
   if (_box.get_len() == 1) {
     Term* t = _box.get_first();
-    rftype::Box* b = t->cast_to<rftype::Box>(type_box);
-    if (b) {
-        _expr = b->get();
+    if (t->is_instance_of<BoxContents>()) {
+        _expr = *(t->get_obj_ptr<BoxContents>());
     } else {
-      FATAL("Box::?(): Symbol does not have a box type");
+      RF_LIB_ERROR(L"Invalid argument");
     }
   } else {
@@ -28 +25 @@
 
 }
+
 }

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

@@ -1 +1 @@
 #include <rf_core.hh>
-
-#include <typeinfo>
-
-using namespace rfrt;
 
 namespace refal
 {
+
+using namespace rfrt;
 
 namespace Box
@@ -16 +14 @@
   if (_box.get_len() == 1) {
     Term* t = _box.get_first();
-    rftype::Box* b = t->cast_to<rftype::Box>(type_box);
-    if (b) {
-        b->put(_expr);
+    if (t->is_instance_of<BoxContents>()) {
+      *(t->get_obj_ptr<BoxContents>()) = _expr;
     } else {
-      FATAL("Box::Store(): Symbol does not have a box type");
+      RF_LIB_ERROR(L"Invalid argument");
     }
   } else {

to-imperative/trunk/library/Class/box_q.cc

@@ -17 +17 @@
 RF_FUNC (Box_q_, (RF_ARG e_Exp;;), RF_VOID)
   if (e_Exp.get_len() == 1) {
-    Term* p = e_Exp.get_first();
-    if (p->get_type() != type_box)
-      RF_RETFAIL;
+    if (e_Exp.get_first()->is_instance_of<BoxContents>())
+      return true;
   }
-  else
-    RF_RETFAIL;
+  RF_RETFAIL;
 RF_END
 

to-imperative/trunk/library/Dir/Makefile

@@ -7 +7 @@
 
 MODULES = \
+  dir_symbol \
   open_dir \
   close_dir \

to-imperative/trunk/library/Dir/file_list

@@ +1 @@
+dir_symbol
 open_dir
 close_dir

to-imperative/trunk/library/Lexer/Lexer.cc

@@ -1812 +1812 @@
 static void init_ ()
 {
-  Case_m_Insensitive = new rftype::Box ();
-  Parenth_m_Level = new rftype::Box ();
+  Case_m_Insensitive = Expr::create_sym<BoxContents>();
+  Parenth_m_Level = Expr::create_sym<BoxContents>();
   _c_0 = Integer::create_expr ("1");
   _c_1 = Integer::create_expr ("0");
-  Collect_m_Errors_m_Box = new rftype::Box (_c_1);
+  Collect_m_Errors_m_Box = Expr::create_sym<BoxContents>(_c_1);
   _c_2 = Char::create_expr (" ");
   _c_3 = Char::create_expr ("\t");

to-imperative/trunk/library/Static/Static.cc

@@ -20 +20 @@
     RF_RETFAIL;
   }
-  Term* first = _v_arg1.get_first();
-  ObjectRef* ref = first->cast_to<ObjectRef>();
-  if (ref) {
-    try {
-      wchar_t const* name;
-      size_t length = ref->get_obj_ptr()->get_name(&name);
-      _v_res1 = Expr::create<Word>(name, length - 1);
-      return true;
-    }
-    catch (Object::InvalidParameter&) {
-      RF_RETFAIL;
-    }
+  wchar_t const* name;
+  size_t length = _v_arg1.get_first()->get_name(&name);
+  if ((size_t)-1 == length)
+  {
+    RF_RETFAIL;
   }
-  RF_RETFAIL;
+  _v_res1 = Expr::create<Word>(name, length);
 RF_END
 

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

@@ -1 +1 @@
 #include <rf_core.hh>
-//#include <pxx_string.ih>
-//#include <stdio.h>
-//#include <errno.h>
+#include <pxx_string.ih>
+#include <stdio.h>
+#include <errno.h>
 #include <ctype.h>
 
@@ -35 +35 @@
   mode[0] = tolower(mode[0]);
   bool res = ch->open(fname, mode);
-  if (!res) RF_RETFAIL;
+  if (!res) {
+    RF_RETFAIL;
+//    throw Expr::create<Word>(L"Open-File") +
+//      Expr::create<Word>(L"Can't open file") + _fname + _mode +
+//      Expr::create<Integer>(errno);
+  }
 RF_END
 

to-imperative/trunk/library/Stream/Stream.cc

@@ -746 +746 @@
 {
   StdIO::init_StdIn.invoke();
-  StdIStream_m_Box = new rftype::Box ();
+  StdIStream_m_Box = Expr::create_sym<BoxContents> ();
   _c_0 = Word::create_expr ("Stream") + Word::create_expr ("Stream");
   _c_1 = Word::create_expr ("Arg 1 is not a Function");

to-imperative/trunk/library/Stream/StreamErr.cc

@@ -135 +135 @@
 static void init_ ()
 {
-  Error_m_Box = new rftype::Box ();
+  Error_m_Box = Expr::create_sym<BoxContents> ();
   _c_4 = Integer::create_expr ("0") + Integer::create_expr ("0");
   _c_0 = (empty) () + (_c_4) ();