Changeset 2044 for to-imperative/trunk/library/List/List.cc

Timestamp:

Aug 1, 2006, 9:31:01 PM (14 years ago)

Author:

orlov

Message:

• Improved Intersperse.

File:

• to-imperative/trunk/library/List/List.cc (modified) (9 diffs)

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

@@ -404 +404 @@
 RF_END
 
-RF_FUNC (Intersperse, (RF_ARG _ve_sep, _ve_list;;), (RF_RES _v_res1;;))
-  Expr _ve_new_m_list (empty);
-  Expr _v_list__1 (_ve_list);
-  for ( ; ; )
-  {
-    {
-      if ((_v_list__1.get_len () != 0))
-      {
-        goto _iter1;
-      }
-      _v_res1 = _ve_new_m_list;
-      goto _exit__iter1;
-    }
-  _iter1: {}
-    {
-      {
-        uintptr_t _v_len1 = _v_list__1.get_len ();
-        uintptr_t _v_len2 = 1;
-        if ((_v_len1 < (_v_len2 + 1)))
-        {
-          goto _block1__branch1;
-        }
-        uintptr_t _v_len__2 = (_v_len1 - _v_len2);
-        Expr _vt_1 (_v_list__1, 0, 1);
-        Expr _vv_2 (_v_list__1, 1, _v_len__2);
-        _ve_new_m_list = (_ve_new_m_list + _vt_1 + _ve_sep);
-        _v_list__1 = _vv_2;
-        goto _block1;
-      }
-    _block1__branch1: {}
-      _ve_new_m_list = (_ve_new_m_list + _v_list__1);
-      _v_list__1 = empty;
-    }
-  _block1: {}
-  }
-_exit__iter1: {}
+RF_FUNC (Intersperse, (RF_ARG _v_arg1, _v_arg2;;), (RF_RES _v_res1;;))
+  {
+    {
+      if (((_v_arg2.get_len () + 1) != 1))
+      {
+        goto _block1__branch1;
+      }
+      Expr _v_compose1 ((_v_arg1 () + _v_arg2));
+      if (_v_compose1.symbol_at (0))
+      {
+        goto _block1__branch1;
+      }
+      Expr _v_deref__compose1 (_v_compose1, 0);
+      uintptr_t _v_len1 = _v_deref__compose1.get_len ();
+      uintptr_t _v_len2 = 0;
+      if ((_v_len1 < _v_len2))
+      {
+        goto _block1__branch1;
+      }
+      uintptr_t _v_len__sep = (_v_len1 - _v_len2);
+      Expr _ve_sep (_v_deref__compose1, 0, _v_len__sep);
+      _v_res1 = empty;
+      goto _block1;
+    }
+  _block1__branch1: {}
+    {
+      if (((_v_arg2.get_len () + 1) != 2))
+      {
+        goto _block1__branch2;
+      }
+      Expr _v_compose2 ((_v_arg1 () + _v_arg2));
+      if (_v_compose2.symbol_at (0))
+      {
+        goto _block1__branch2;
+      }
+      Expr _v_deref__compose2 (_v_compose2, 0);
+      uintptr_t _v_len3 = _v_deref__compose2.get_len ();
+      uintptr_t _v_len4 = 0;
+      if ((_v_len3 < _v_len4))
+      {
+        goto _block1__branch2;
+      }
+      uintptr_t _v_len__sep2 = (_v_len3 - _v_len4);
+      Expr _vt_1 (_v_compose2, 1, 1);
+      Expr _ve_sep (_v_deref__compose2, 0, _v_len__sep2);
+      _v_res1 = _vt_1;
+      goto _block1;
+    }
+  _block1__branch2: {}
+    uintptr_t _v_len5 = (_v_arg2.get_len () + 1);
+    uintptr_t _v_len6 = 2;
+    if ((_v_len5 < _v_len6))
+    {
+      RF_FUNC_ERROR (unexpected_fail);
+    }
+    uintptr_t _v_len__list = (_v_len5 - _v_len6);
+    Expr _v_compose3 ((_v_arg1 () + _v_arg2));
+    if (_v_compose3.symbol_at (0))
+    {
+      RF_FUNC_ERROR (unexpected_fail);
+    }
+    Expr _v_deref__compose3 (_v_compose3, 0);
+    uintptr_t _v_len7 = _v_deref__compose3.get_len ();
+    uintptr_t _v_len8 = 0;
+    if ((_v_len7 < _v_len8))
+    {
+      RF_FUNC_ERROR (unexpected_fail);
+    }
+    uintptr_t _v_len__sep3 = (_v_len7 - _v_len8);
+    Expr _vt_1 (_v_compose3, 1, 1);
+    Expr _ve_list (_v_compose3, 2, _v_len__list);
+    Expr _ve_sep (_v_deref__compose3, 0, _v_len__sep3);
+    Expr _ve_new_m_list ((_vt_1 + _ve_sep));
+    for ( ; ; )
+    {
+      {
+        if ((_ve_list.get_len () != 1))
+        {
+          goto _iter1;
+        }
+        Expr _vt_2 (_ve_list, 0, 1);
+        _v_res1 = (_ve_new_m_list + _vt_2);
+        goto _exit__iter1;
+      }
+    _iter1: {}
+      uintptr_t _v_len9 = _ve_list.get_len ();
+      uintptr_t _v_len10 = 1;
+      if ((_v_len9 < _v_len10))
+      {
+        RF_FUNC_ERROR (unexpected_fail);
+      }
+      uintptr_t _v_len__rest = (_v_len9 - _v_len10);
+      Expr _vt_2 (_ve_list, 0, 1);
+      Expr _ve_rest (_ve_list, 1, _v_len__rest);
+      _ve_new_m_list = (_ve_new_m_list + _vt_2 + _ve_sep);
+      _ve_list = _ve_rest;
+    }
+  _exit__iter1: {}
+  }
+_block1: {}
 RF_END
 
@@ -471 +535 @@
           goto _block2__branch1;
         }
-        RF_lsplit (_ve_selected, 0, _ve__e__e_tmp_m_Listrf_m_95_m_21, _v_lsplit__selected);
+        RF_lsplit (_ve_selected, 0, _ve__e__e_tmp_m_Listrf_m_98_m_21, _v_lsplit__selected);
         for ( ; ; RF_iter(_ve_selected)++)
         {
@@ -485 +549 @@
               goto _block2__branch1;
             }
-            uintptr_t _v_len___e__e_tmp_m_Listrf_m_95_m_28 = (_v_len3 - _v_len4);
+            uintptr_t _v_len___e__e_tmp_m_Listrf_m_98_m_28 = (_v_len3 - _v_len4);
             if (!_vt_erm.term_eq (_v_lsplit__selected, 0))
             {
               goto _continue1;
             }
-            Expr _ve__e__e_tmp_m_Listrf_m_95_m_28 (_v_lsplit__selected, 1, _v_len___e__e_tmp_m_Listrf_m_95_m_28);
+            Expr _ve__e__e_tmp_m_Listrf_m_98_m_28 (_v_lsplit__selected, 1, _v_len___e__e_tmp_m_Listrf_m_98_m_28);
             _v_expr__1 = _ve_rest;
             goto _exit1;
@@ -618 +682 @@
           goto _block2__branch1;
         }
-        RF_lsplit (_v_list1__1, 0, _ve__e__e_tmp_m_Listrf_m_127_m_20, _v_lsplit__list1__1);
+        RF_lsplit (_v_list1__1, 0, _ve__e__e_tmp_m_Listrf_m_130_m_20, _v_lsplit__list1__1);
         for ( ; ; RF_iter(_v_list1__1)++)
         {
@@ -632 +696 @@
               goto _block2__branch1;
             }
-            uintptr_t _v_len___e__e_tmp_m_Listrf_m_127_m_27 = (_v_len3 - _v_len4);
+            uintptr_t _v_len___e__e_tmp_m_Listrf_m_130_m_27 = (_v_len3 - _v_len4);
             if (!_vt_erm.term_eq (_v_lsplit__list1__1, 0))
             {
               goto _continue1;
             }
-            Expr _ve__e__e_tmp_m_Listrf_m_127_m_27 (_v_lsplit__list1__1, 1, _v_len___e__e_tmp_m_Listrf_m_127_m_27);
+            Expr _ve__e__e_tmp_m_Listrf_m_130_m_27 (_v_lsplit__list1__1, 1, _v_len___e__e_tmp_m_Listrf_m_130_m_27);
             _v_list2__1 = _ve_rest;
             goto _exit1;
@@ -684 +748 @@
           goto _block2__branch1;
         }
-        RF_lsplit (_ve_list2, 0, _ve__e__e_tmp_m_Listrf_m_141_m_20, _v_lsplit__list2);
+        RF_lsplit (_ve_list2, 0, _ve__e__e_tmp_m_Listrf_m_144_m_20, _v_lsplit__list2);
         for ( ; ; RF_iter(_ve_list2)++)
         {
@@ -698 +762 @@
               goto _block2__branch1;
             }
-            uintptr_t _v_len___e__e_tmp_m_Listrf_m_141_m_27 = (_v_len3 - _v_len4);
+            uintptr_t _v_len___e__e_tmp_m_Listrf_m_144_m_27 = (_v_len3 - _v_len4);
             if (!_vt_erm.term_eq (_v_lsplit__list2, 0))
             {
               goto _continue1;
             }
-            Expr _ve__e__e_tmp_m_Listrf_m_141_m_27 (_v_lsplit__list2, 1, _v_len___e__e_tmp_m_Listrf_m_141_m_27);
+            Expr _ve__e__e_tmp_m_Listrf_m_144_m_27 (_v_lsplit__list2, 1, _v_len___e__e_tmp_m_Listrf_m_144_m_27);
             _v_list1__1 = _ve_rest;
             _ve_and = (_ve_and + _vt_erm);
@@ -750 +814 @@
           goto _block2__branch1;
         }
-        RF_lsplit (_ve_list2, 0, _ve__e__e_tmp_m_Listrf_m_155_m_20, _v_lsplit__list2);
+        RF_lsplit (_ve_list2, 0, _ve__e__e_tmp_m_Listrf_m_158_m_20, _v_lsplit__list2);
         for ( ; ; RF_iter(_ve_list2)++)
         {
@@ -764 +828 @@
               goto _block2__branch1;
             }
-            uintptr_t _v_len___e__e_tmp_m_Listrf_m_155_m_27 = (_v_len3 - _v_len4);
+            uintptr_t _v_len___e__e_tmp_m_Listrf_m_158_m_27 = (_v_len3 - _v_len4);
             if (!_vt_erm.term_eq (_v_lsplit__list2, 0))
             {
               goto _continue1;
             }
-            Expr _ve__e__e_tmp_m_Listrf_m_155_m_27 (_v_lsplit__list2, 1, _v_len___e__e_tmp_m_Listrf_m_155_m_27);
+            Expr _ve__e__e_tmp_m_Listrf_m_158_m_27 (_v_lsplit__list2, 1, _v_len___e__e_tmp_m_Listrf_m_158_m_27);
             _v_list1__1 = _ve_rest;
             goto _exit1;