Changeset 888

Timestamp:

Jun 29, 2003, 8:50:45 PM (18 years ago)

Author:

luba

Message:

• String library function

Location:

to-imperative/trunk/library/String

Files:

• create_string.hh (modified) (5 diffs)
• string.cc (modified) (2 diffs)

to-imperative/trunk/library/String/create_string.hh

@@ -5 +5 @@
 
 #include <rf_core.hh>
-#include <rf_string.hh>
-#include <rf_char.hh>
-#include <rf_word.hh>
+//#include <rf_string.hh>
+//#include <rf_char.hh>
+//#include <rf_word.hh>
 
 namespace refal
 {
-
 using namespace rfrt;
 using namespace rftype;
@@ -18 +17 @@
 {
 
+
 inline static
-rf_string::String create_string(const Expr &e_Sourse, const char *fname)
+WString::String create_string(const Expr &e_Sourse)//, const char *fname)
 {
   uintptr_t len = 0;
@@ -26 +26 @@
   for (; p < e_Sourse.get_last(); p++)
   {
-    if (p->get_type() == RF_TYPE(Char))
+    if (p->get_type() == type_char)
       len++;
     else
-    if (p->get_type() == RF_TYPE(Word))
-      len += Word(*p).get_len();
+    if (p->get_type() == type_word)
+      len += ((Word*)p)->get_len();
     else
-    if (p->get_type() == RF_TYPE(WString))
-      len += WString(*p).get_len();
+    if (p->get_type() == type_string)
+      len += ((WString*)p)->get_length();
     else
-      RF_LIB_ERROR_IN_FUNC(fname, "Invalid argument");
+      RF_LIB_ERROR("Invalid argument");
   }
 
@@ -42 +42 @@
     WString string(len);
 
-    WString::Iterator i = string;
-    
     for (p = e_Sourse.get_first(); p < e_Sourse.get_last(); p++)
     {
-      if (p->get_type() == RF_TYPE(Char))
+       string = string + WString(*p);
+#if 0
+      if (p->get_type() == type_char)
       {
-        *i++ = Char(*p);
       }
       else
-      if (p->get_type() == RF_TYPE(Word))
+      if (p->get_type() == type_word)
       {
-        Word::Iterator wi = Word(*p);
-        while (wi.in_bounds())
-          *i++ = *wi++;
+        string = string + WString(*p);
       }
       else // p points to String
       {
-        WString s = *p;
-        i.fill_with_string(s);
+        String s = *p;
+        string = string + s;
         i += s.get_len();
       }
+#endif
+
     }
-
     return string;
-
   }
   catch (const pxx::SysError &err)
   {
     if (err.get_code() == ENOMEM)
-      RF_LIB_ERROR_IN_FUNC(fname, "Size limit excedeed");
+      RF_LIB_ERROR("Size limit excedeed");
     throw;
   }
@@ -80 +77 @@
 
 }
+    
 

to-imperative/trunk/library/String/string.cc

@@ -5 +5 @@
 
 #include <rf_core.hh>
-#include <rf_string.hh>
 
 #include "create_string.hh"
@@ -19 +18 @@
 
 RF_FUNC (String, (RF_ARG e_Sourse), (RF_RES s_String))
+ 
+  WString string = create_string(e_Sourse);//, __func__);
+  //for (size_t i = 0; i < string.get_length(); i++)
+  //  printf ("string[i] = %c\n", string[i]);
 
-  s_String = create_string(e_Sourse, __func__).to_symbol();
-
+  rftype::String& _str = static_cast<rftype::String&>(string);
+  rftype::String* str_ptr = &_str;
+  s_String = rftype::String::create_expr(str_ptr);
+  // printf ("string end\n");    
 RF_END
 
 }
+  
+}
 
-}
+