improve default file list after "fc", implement "fx"

pub/src/frida2.cpp

@@ -214,6 +214,7 @@ int main()
                     "  fe1  export (scan -> tab-separated line)\n"
                     "  fe2  export (as tab)\n"
                     "  fc   copy\n"
+                    "  fx   exchange (copy, then delete source)\n"
                     "  fdel delete\n"
                     "  fm   make\n"
                     "  fr   read in\n"
@@ -235,6 +236,8 @@ int main()
                 NEdif::Save( "tab" );
             } else if (cmd == "fc") {
                 OlfCopy();
+            } else if (cmd == "fx") {
+                OlfExchange();
             } else if (cmd == "fdel") {
                 OlfDel();
             } else if (cmd == "fm") {

pub/src/olm.cpp

@@ -362,7 +362,7 @@ CEle* NOlm::OloPushBack( CEle *e )
     return &( MOM.back() );
 }
 
-void NOlm::OlfDel(void)
+void NOlm::OlfDel()
 {
     for (uint i = FSel.size()-1; i!=(uint)-1; --i) {
         MOM[FSel.V[i]].predelete();
@@ -377,14 +377,31 @@ void NOlm::OlfDel(void)
         FSel = CList();
 }
 
-void NOlm::OlfCopy(void)
+void NOlm::OlfCopy()
 {
     CEle *e;
     IterateEle eiter;
+    SelNew();
     while ((e=eiter()))
         OloAdd(e->P());
 }
 
+void NOlm::OlfExchange()
+{
+    CEle *e;
+    IterateEle eiter;
+    FSelOld = FSel;
+    FSel = CList();
+    while ((e=eiter()))
+        OloAdd(e->P());
+    for (uint i = FSelOld.size()-1; i!=(uint)-1; --i) {
+        MOM[FSelOld.V[i]].predelete();
+        MOM.erase(MOM.begin()+FSelOld.V[i]);
+    }
+    for ( uint i=0; i<FSelOld.size(); ++i )
+        FSel.V[i] -= FSelOld.size();
+}
+
 void NOlm::OlfLoop(int(*exec)(int fno, COld *fin, COld *fout))
 {
     IterateD fiter;

pub/src/olm.h

@@ -166,8 +166,9 @@ namespace NOlm { // on-line memory
     void SelPop(void);
     CEle* OloPushBack( CEle *e );
     CEle* OloAdd( const class COlo *olo );
-    void OlfDel(void);
-    void OlfCopy(void);
+    void OlfDel();
+    void OlfExchange();
+    void OlfCopy();
     void OlfLoop(int (*exec) (int fno, COld *fin, COld *fout));
 
     // scan selection: