Changeset 1000

Timestamp:

Jul 10, 2003, 10:05:21 PM (18 years ago)

Author:

sveta

Message:

• Correction of function.

Location:

to-imperative/trunk/library/Table

Files:

• bind.cc (modified) (1 diff)
• domain.cc (modified) (1 diff)
• in_table.cc (modified) (1 diff)
• lookup.cc (modified) (1 diff)
• replace_table.cc (modified) (1 diff)
• table_copy.cc (modified) (1 diff)
• unbind.cc (modified) (1 diff)

to-imperative/trunk/library/Table/bind.cc

@@ -14 +14 @@
 RF_FUNC (Bind, (RF_ARG _table, _key, _val), ())
    
-  if (_table.get_len()==1) {
+  if (_table.get_len() == 1) {
     Term* p = _table.get_first();
-    if (p->get_type() == type_table) {
-      rftype::Table* _t=p->cast_to<rftype::Table>(type_table);
-      if (!_t)
-        RF_LIB_ERROR("Invalid argument1");
-      _t -> Bind(_key,_val);
-   } else
-     RF_LIB_ERROR("Invalid argument2");   
- } else
-   RF_LIB_ERROR("Invalid argument3");
+    rftype::Table* _t = p->cast_to<rftype::Table>(type_table);
+    if (!_t)
+      RF_LIB_ERROR("Invalid argument");
+    _t -> Bind(_key,_val);   
+  } else
+   RF_LIB_ERROR("Invalid argument");
 
 RF_END

to-imperative/trunk/library/Table/domain.cc

@@ -15 +15 @@
  
  if (_table.get_len()==1) {
-    Term* p = _table.get_first();
-      if (p->get_type() == type_table) {
-        rftype::Table* t=p->cast_to<rftype::Table>(type_table);
-        if (!t)
-          RF_LIB_ERROR("Invalid argument");
-        _res=t->Domain(); 
-     } else
-       RF_LIB_ERROR("Invalid argument");   
+   Term* p = _table.get_first();
+   rftype::Table* t = p->cast_to<rftype::Table>(type_table);
+   if (!t)
+     RF_LIB_ERROR("Invalid argument");
+   _res=t->Domain();    
    } else
      RF_LIB_ERROR("Invalid argument");

to-imperative/trunk/library/Table/in_table.cc

@@ -14 +14 @@
 RF_FUNC (In_m_Table_q_, (RF_ARG _table, _key), ())
    
-  if (_table.get_len()==1) {
+  if (_table.get_len() == 1) {
     Term* p = _table.get_first();
-    if (p->get_type() == type_table) {
-      rftype::Table* _t=p->cast_to<rftype::Table>(type_table);
-      if (!_t)
-        RF_LIB_ERROR("Invalid argument");
-      if (!(_t->InTable(_key))) 
-        retfail;
-    } else
-      RF_LIB_ERROR("Invalid argument");   
+    rftype::Table* _t = p->cast_to<rftype::Table>(type_table);
+    if (!_t)
+      RF_LIB_ERROR("Invalid argument");
+    if (!(_t->InTable(_key))) 
+      retfail;   
   } else
     RF_LIB_ERROR("Invalid argument");

to-imperative/trunk/library/Table/lookup.cc

@@ -16 +16 @@
   Expr result;
   if (_table.get_len()==1) {
-    Term* p = _table.get_first();
-    if (p->get_type() == type_table) { 
-      rftype::Table*  _t = p->cast_to<rftype::Table>(type_table);         
-      if (!_t)
-        RF_LIB_ERROR("Invalid argument");  
-      if (!(_t->Lookup(_key, result))) 
-        retfail;
-      _val=result;
-    } else
-      RF_LIB_ERROR("Invalid argument");   
+    Term* p = _table.get_first(); 
+    rftype::Table*  _t = p->cast_to<rftype::Table>(type_table);         
+    if (!_t)
+      RF_LIB_ERROR("Invalid argument");  
+    if (!(_t->Lookup(_key, result))) 
+      retfail;
+    _val=result;   
   } else
     RF_LIB_ERROR("Invalid argument");

to-imperative/trunk/library/Table/replace_table.cc

@@ -15 +15 @@
    
   if (_target.get_len()==1) {
-    Term* p = _target.get_first();
-    if (p->get_type() == type_table) {
-      rftype::Table* target = p->cast_to<rftype::Table>(type_table);
-      if (!target)
+    Term* p = _target.get_first();      
+    rftype::Table* target = p->cast_to<rftype::Table>(type_table);
+    if (!target)
+      RF_LIB_ERROR("Invalid argument");
+    if (_source.get_len() == 1) {
+      Term* t = _source.get_first();
+      rftype::Table* source = t->cast_to<rftype::Table>(type_table);
+      if (!source)
         RF_LIB_ERROR("Invalid argument");
-      if (_source.get_len()==1) {
-        Term* t = _source.get_first();
-        if (t->get_type() == type_table) {
-          rftype::Table* source=t->cast_to<rftype::Table>(type_table);
-          if (!source)
-            RF_LIB_ERROR("Invalid argument");
-          target->ReplaceTable(*source);     
-        } else
-          RF_LIB_ERROR("Invalid argument");   
-      } else
-        RF_LIB_ERROR("Invalid argument");
+      target->ReplaceTable(*source);        
     } else
       RF_LIB_ERROR("Invalid argument");   

to-imperative/trunk/library/Table/table_copy.cc

@@ -18 +18 @@
   if (_table.get_len() == 1) {
     Term* p = _table.get_first();
-    if (p->get_type() == type_table) {
-      rftype::Table* t = p->cast_to<rftype::Table>(type_table);
-      if (!t)
-        RF_LIB_ERROR("Invalid argument");          
-      rftype::Table* copy = new rftype::Table(); 
-      t->TableCopy(*copy);     
-      _tabcopy = Expr (new rftype::Table(*copy));
-     } else
-       RF_LIB_ERROR("Invalid argument");   
+    rftype::Table* t = p->cast_to<rftype::Table>(type_table);
+    if (!t)
+      RF_LIB_ERROR("Invalid argument");          
+    rftype::Table* copy = new rftype::Table(); 
+    t->TableCopy(*copy);     
+    _tabcopy = Expr (new rftype::Table(*copy));   
   } else
     RF_LIB_ERROR("Invalid argument");

to-imperative/trunk/library/Table/unbind.cc

@@ -16 +16 @@
   if (_table.get_len() == 1) {
     Term* p = _table.get_first();
-    if (p->get_type() == type_table) {
-      rftype::Table* t = p->cast_to<rftype::Table>(type_table);
-      if (!t)
-        RF_LIB_ERROR("Invalid argument");
-      t -> Unbind(_key);
-    } else
-      RF_LIB_ERROR("Invalid argument");   
+    rftype::Table* t = p->cast_to<rftype::Table>(type_table);
+    if (!t)
+      RF_LIB_ERROR("Invalid argument");
+    t -> Unbind(_key);                                                    
   } else
     RF_LIB_ERROR("Invalid argument");