Commit: 495b4d49e7d5a9c549e0568491651c5d12fc9f62 - xyzsh (git)

シェルスクリプト言語xyzshのソースコード。

Commit MetaInfo

• Revision: 495b4d49e7d5a9c549e0568491651c5d12fc9f62 (tree)
• Time: 2013-01-04 01:04:40
• Author: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Log Message

1.2.8

Change Summary

• modified: CHANGELOG
• modified: Makefile.in
• modified: README
• modified: README.ja
• modified: TODO
• modified: USAGE.ja
• modified: configure
• modified: configure.in
• modified: src/block.c
• modified: src/cmd_base.c
• modified: src/cmd_str.c
• add: src/extprog.c
• add: src/fd.c
• modified: src/gc.c
• modified: src/hash.c
• modified: src/interface.c
• add: src/nfun.c
• modified: src/object.c
• modified: src/parser.c
• modified: src/readline.c
• modified: src/run.c
• modified: src/string.c
• modified: src/uobject.c
• modified: src/xyzsh.c
• modified: src/xyzsh/block.h
• modified: src/xyzsh/debug.h
• modified: src/xyzsh/xyzsh.h

Incremental Difference

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,18 @@
 
+2013 4th January version 1.2.8
+
+    1. Refactoring.
+
+    2. Fixed a memory leak bug.
+
+    3. Dynamic Library version up. This change involves mfiler4.
+
+2013 1月4日 version 1.2.8
+
+    1. リファクタリング。
+    2. メモリーリークを修正。
+    3.  ダイナミックライブラリのバージョンアップ。mfiler4にも影響があります。mfiler4は1.0.7から、このxyzshに対応します。
+
 2012 12月20日 version 1.2.7
 
 	1. グロブの展開がパーサー時ではなくて実行時に起こるように変更。

--- a/Makefile.in
+++ b/Makefile.in
@@ -87,6 +87,12 @@ libxyzsh.dylib: libxyzsh.$(SO_VERSION).dylib
 	cp libxyzsh.$(SO_VERSION).dylib libxyzsh.1.dylib
 	cp libxyzsh.$(SO_VERSION).dylib libxyzsh.dylib
 
+permission:
+	chmod 644 *
+	chmod 755 .git man src configure
+	chmod 644 src/*.c
+	chmod 644 src/xyzsh/*.h
+
 #########################################################
 # install
 #########################################################

--- a/README
+++ b/README
@@ -168,6 +168,9 @@ Files
     src/stack.c --> xyzsh stack object manager
     src/string.c --> string library
     src/vector.c --> dynamic array library
+    src/nfun.c --> native function object
+    src/fd.c --> file discriptor object
+    src/extprog.c --> external program object
 
 LINCENSE
     MIT Lincense.

--- a/README.ja
+++ b/README.ja
@@ -207,15 +207,13 @@ xyzshが使用するファイル
     src/xyzsh.c --> xyzshのその他のルーチンを集めている
     src/readline.c --> readlineを扱っているソース。
     src/run.c --> xyzshのメインエンジン
-    src/stack.c --> xyzshのスタックを扱う実装。xyzshはガベージコレクションとスタックとmalloc&deleteの３つのメモリ管理を
-                    使ってオブジェクトを生成したり開放したりしている。ただし、malloc&deleteによるオブジェクトの管理は
-                    よほど内部を把握していないと予期せぬセグフォが起こるので、xyzshを組み込む場合にmalloc&deleteによる
-                    オブジェクトの生成、開放を行うことはお勧めできない。
-                    (たとえば、xyzshコードをmallocで生成して、そのxyzshコードを実行している最中に、そのxyzshコードを含む
-                    オブジェクトがdeleteされた場合などはセグフォを起こす)
+    src/stack.c --> xyzshのスタックを扱う実装。
     src/string.c --> 文字列ライブラリ
     src/uobject --> ユーザーオブジェクトの定義
     src/vector.c --> 動的配列の実装
+    src/nfun.c --> ネイティブ関数オブジェクトの実装
+    src/fd.c --> ファイル記述子オブジェクトの実装
+    src/extprog.c --> 外部プログラムオブジェクトの実装
 
 ラインセンス
 

--- a/TODO
+++ b/TODO
@@ -2,4 +2,9 @@ Fedoraなど各環境でコンパイルと日本語を通したselectorのチェ
 
 端末のサイズを変えたときに画面が乱れる mfiler4
 
-コードの情報で複数の情報で変数を分けているやつは無駄なのでひとつに統一して論理演算で情報を操作する
+Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7f95128197d0
+    Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7f951292dbb0
+
+
+    Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7ff502820bb0
+        Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7ff502806d50

--- a/USAGE.ja
+++ b/USAGE.ja
@@ -773,3 +773,11 @@
 
     でコマンドの使い方を見ることができます。各コマンドのオプションなどはそちらで調べてください。
 
+3.5 xyzshの組み込みについて
+
+    xyzshのメモリ管理について。xyzshはGCとスタックとmalloc&freeの3つのオブジェクトのメモリ管理を行なってます。しかし、以下の制限があります。
+    GCで作り出されるオブジェクトはマークをさせるためにgRootObjectかgXyzshObjectから辿れるようにしなければなりません。(GCで管理されてgRootObjectかgXyzshObjectから辿れるコンテナオブジェクトに格納される必要がある)。でなければ、sweepで消されてしまいます。sweepは一定回数コードを実行すると自動的に実行されます。
+    GCで作り出したコンテナオブジェクトにはGCで管理されるオブジェクトしか格納できません。同じようにスタックで作り出したコンテナオブジェクトにはスタックで管理されるオブジェクトを、MALLOCで作り出されるコンテナオブジェクトにはMALLOCで管理されるオブジェクトを格納してください。
+    ユーザーによって定義される外部オブジェクト(EXTOBJ)の構造体内のオブジェクトではmallocによるオブジェクトの管理を行なってください。構造体内のオブジェクトをGCで管理を行なってmMarkFunでそのオブジェクトをマークしてもGCのオブジェクトのsweep順によっては正しく動作しません。セグメンテーションフォルトが起こる可能性もあります。ただし、blockオブジェクトはmallocによって管理できないので、blockオブジェクトは手動でマークしてください。stringオブジェクトもGCによって管理できるはずです。
+
+

--- a/configure
+++ b/configure
@@ -3029,7 +3029,7 @@ SO_VERSION=1.5.5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Operating System" >&5
 $as_echo_n "checking Operating System... " >&6; }
 
-OBJ="src/gc.o src/stack.o src/string.o src/list.o src/kanji.o src/debug.o src/hash.o src/vector.o src/block.o src/fun.o src/class.o src/completion.o src/xyzsh.o src/parser.o src/run.o src/readline.o src/curses.o src/cmd_base.o src/cmd_obj.o src/cmd_file.o src/cmd_str.o src/cmd_ary.o src/cmd_condition.o src/interface.o src/memchecker.o src/object.o src/uobject.o src/cmd_num.o src/cmd_curses.o"
+OBJ="src/gc.o src/stack.o src/string.o src/list.o src/kanji.o src/debug.o src/hash.o src/vector.o src/block.o src/fun.o src/class.o src/completion.o src/xyzsh.o src/parser.o src/run.o src/readline.o src/curses.o src/cmd_base.o src/cmd_obj.o src/cmd_file.o src/cmd_str.o src/cmd_ary.o src/cmd_condition.o src/interface.o src/memchecker.o src/object.o src/uobject.o src/cmd_num.o src/cmd_curses.o src/fd.o src/nfun.o src/extprog.o"
 
 
 if test `uname -s` = "Darwin"; then

--- a/configure.in
+++ b/configure.in
@@ -32,11 +32,11 @@ AC_SUBST(SYSTEM_MIGEMODIR)
 #####################################################################
 # check operating systems
 #####################################################################
-SO_VERSION=1.5.5
+SO_VERSION=1.5.6
 AC_SUBST(SO_VERSION)
 AC_MSG_CHECKING(Operating System)
 
-OBJ="src/gc.o src/stack.o src/string.o src/list.o src/kanji.o src/debug.o src/hash.o src/vector.o src/block.o src/fun.o src/class.o src/completion.o src/xyzsh.o src/parser.o src/run.o src/readline.o src/curses.o src/cmd_base.o src/cmd_obj.o src/cmd_file.o src/cmd_str.o src/cmd_ary.o src/cmd_condition.o src/interface.o src/memchecker.o src/object.o src/uobject.o src/cmd_num.o src/cmd_curses.o"
+OBJ="src/gc.o src/stack.o src/string.o src/list.o src/kanji.o src/debug.o src/hash.o src/vector.o src/block.o src/fun.o src/class.o src/completion.o src/xyzsh.o src/parser.o src/run.o src/readline.o src/curses.o src/cmd_base.o src/cmd_obj.o src/cmd_file.o src/cmd_str.o src/cmd_ary.o src/cmd_condition.o src/interface.o src/memchecker.o src/object.o src/uobject.o src/cmd_num.o src/cmd_curses.o src/fd.o src/nfun.o src/extprog.o"
 AC_SUBST(OBJ)
 
 if test `uname -s` = "Darwin"; then

--- a/src/block.c
+++ b/src/block.c
@@ -1,4 +1,5 @@
 #include "config.h"
+
 #include "xyzsh/xyzsh.h"
 #include <string.h>
 #include <stdio.h>
@@ -432,94 +433,6 @@ static void sCommand_copy_deeply_stack(sCommand* dest, sCommand* src)
     dest->mRedirectsFileNamesRuntime = NULL;
 }
 
-static void sCommand_copy_deeply_malloc(sCommand* dest, sCommand* src)
-{
-    dest->mKind = src->mKind;
-
-    dest->mArgs = MALLOC(sizeof(char*)*src->mArgsSize);
-    dest->mArgsFlags = MALLOC(sizeof(int)*src->mArgsSize);
-    dest->mArgsNum = src->mArgsNum;
-    dest->mArgsSize = src->mArgsSize;
-
-    int i;
-    for(i=0; i<src->mArgsNum; i++) {
-        dest->mArgs[i] = STRDUP(src->mArgs[i]);
-        dest->mArgsFlags[i] = src->mArgsFlags[i];
-    }
-    dest->mArgs[i] = NULL;
-
-    dest->mEnvs = MALLOC(sizeof(sEnv)*src->mEnvsSize);
-    for(i=0; i<src->mEnvsNum; i++) {
-        dest->mEnvs[i].mKind = src->mEnvs[i].mKind;
-
-        if(src->mEnvs[i].mKind == kEnv) {
-            dest->mEnvs[i].mName = STRDUP(src->mEnvs[i].mName);
-            dest->mEnvs[i].mKey = STRDUP(src->mEnvs[i].mKey);
-            dest->mEnvs[i].mKeyEnv = src->mEnvs[i].mKeyEnv;
-            dest->mEnvs[i].mDoubleDollar = src->mEnvs[i].mDoubleDollar;
-        }
-        else {
-            dest->mEnvs[i].mBlock = block_clone_malloc(src->mEnvs[i].mBlock);
-            dest->mEnvs[i].mDoubleDollar = src->mEnvs[i].mDoubleDollar;
-            dest->mEnvs[i].mLineField = src->mEnvs[i].mLineField;
-        }
-    }
-    dest->mEnvsNum = src->mEnvsNum;
-    dest->mEnvsSize = src->mEnvsSize;
-
-/*
-    dest->mArgsRuntime = MALLOC(sizeof(char*)*src->mArgsSizeRuntime);
-    dest->mArgsNumRuntime = src->mArgsNumRuntime;
-    dest->mArgsSizeRuntime = src->mArgsSizeRuntime;
-
-    for(i=0; i<src->mArgsNumRuntime; i++) {
-        dest->mArgsRuntime[i] = STRDUP(src->mArgsRuntime[i]);
-    }
-    dest->mArgsRuntime[i] = NULL;
-*/
-    dest->mArgsRuntime = MALLOC(sizeof(char*)*3);
-    dest->mArgsSizeRuntime = 3;
-    dest->mArgsNumRuntime = 0;
-
-    dest->mBlocks = MALLOC(sizeof(sObject*)*src->mBlocksSize);
-    dest->mBlocksNum = src->mBlocksNum;
-    dest->mBlocksSize = src->mBlocksSize;
-
-    for(i=0; i<src->mBlocksNum; i++) {
-        dest->mBlocks[i] = block_clone_malloc(src->mBlocks[i]);
-    }
-
-    dest->mRedirectsFileNames = MALLOC(sizeof(char*)*src->mRedirectsSize);
-    for(i=0; i<src->mRedirectsNum; i++) {
-        dest->mRedirectsFileNames[i] = STRDUP(src->mRedirectsFileNames[i]);
-    }
-    dest->mRedirects = MALLOC(sizeof(int)*src->mRedirectsSize);
-    for(i=0; i<src->mRedirectsNum; i++) {
-        dest->mRedirects[i] = src->mRedirects[i];
-    }
-    dest->mRedirectsSize = src->mRedirectsSize;
-    dest->mRedirectsNum = src->mRedirectsNum;
-
-/*
-    memcpy(dest->mOptions, src->mOptions, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
-
-    for(i=0; i<XYZSH_OPTION_MAX; i++) {
-        if(src->mOptions[i].mKey) { dest->mOptions[i].mKey = STRDUP(src->mOptions[i].mKey); }
-        if(src->mOptions[i].mArg) { dest->mOptions[i].mArg = STRDUP(src->mOptions[i].mArg); }
-    }
-*/
-    memset(dest->mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
-
-    if(src->mMessagesNum > 0) {
-        for(i=0; i<src->mMessagesNum; i++) {
-            dest->mMessages[i] = STRDUP(src->mMessages[i]);
-        }
-        dest->mMessagesNum = src->mMessagesNum;
-    }
-
-    dest->mRedirectsFileNamesRuntime = NULL;
-}
-
 void sCommand_delete(sCommand* self)
 {
     int i;
@@ -568,59 +481,6 @@ void sCommand_delete(sCommand* self)
     }
 }
 
-void sCommand_delete_malloc(sCommand* self)
-{
-    int i;
-    for(i=0; i<self->mArgsNum; i++) {
-        FREE(self->mArgs[i]);
-    }
-    FREE(self->mArgs);
-    FREE(self->mArgsFlags);
-    for(i=0; i<self->mArgsNumRuntime; i++) {
-        FREE(self->mArgsRuntime[i]);
-    }
-    FREE(self->mArgsRuntime);
-
-    for(i=0; i<self->mEnvsNum; i++) {
-        if(self->mEnvs[i].mKind == kEnv) {
-            FREE(self->mEnvs[i].mName);
-            FREE(self->mEnvs[i].mKey);
-        }
-        else {
-            block_delete_malloc(self->mEnvs[i].mBlock);
-        }
-    }
-    if(self->mEnvs) FREE(self->mEnvs);
-
-    for(i=0; i<XYZSH_OPTION_MAX; i++) {
-        if(self->mOptions[i].mKey) { FREE(self->mOptions[i].mKey); }
-        if(self->mOptions[i].mArg) { FREE(self->mOptions[i].mArg); }
-    }
-    for(i=0; i<self->mMessagesNum; i++) {
-        FREE(self->mMessages[i]);
-    }
-
-    for(i=0; i<self->mBlocksNum; i++) {
-        block_delete_malloc(self->mBlocks[i]);
-    }
-    if(self->mBlocks) FREE(self->mBlocks);
-
-    if(self->mRedirectsFileNames) {
-        for(i=0; i<self->mRedirectsNum; i++) {
-            FREE(self->mRedirectsFileNames[i]);
-        }
-        FREE(self->mRedirectsFileNames);
-    }
-    if(self->mRedirects) FREE(self->mRedirects);
-
-    if(self->mRedirectsFileNamesRuntime) {
-        for(i=0; i<self->mRedirectsNum; i++) {
-            FREE(self->mRedirectsFileNamesRuntime[i]);
-        }
-        FREE(self->mRedirectsFileNamesRuntime);
-    }
-}
-
 void sCommand_view(sCommand* self)
 {
     printf("mArgsSize: %d\n", self->mArgsSize);
@@ -746,26 +606,6 @@ static void sStatment_copy_deeply_stack(sStatment* dest, sStatment* source)
     dest->mFlags = source->mFlags;
 }
 
-static void sStatment_copy_deeply_malloc(sStatment* dest, sStatment* source)
-{
-    dest->mCommandsNum = source->mCommandsNum;
-
-    int i;
-    for(i=0; i<source->mCommandsNum; i++) {
-        sCommand_copy_deeply_malloc(dest->mCommands + i, source->mCommands + i);
-    }
-
-    if(source->mFName) {
-        dest->mFName = STRDUP(source->mFName);
-    }
-    else {
-        dest->mFName = NULL;
-    }
-    dest->mLine = source->mLine;
-
-    dest->mFlags = source->mFlags;
-}
-
 void sStatment_delete(sStatment* self)
 {
     int i;
@@ -775,15 +615,6 @@ void sStatment_delete(sStatment* self)
     if(self->mFName) FREE(self->mFName);
 }
 
-void sStatment_delete_malloc(sStatment* self)
-{
-    int i;
-    for(i=0; i<self->mCommandsNum; i++) {
-        sCommand_delete_malloc(self->mCommands + i);
-    }
-    if(self->mFName) FREE(self->mFName);
-}
-
 void sStatment_view(sStatment* self)
 {
     printf("mFlags ");
@@ -817,34 +648,6 @@ void sStatment_view(sStatment* self)
     }
 }
 
-#ifdef MDEBUG
-sObject* block_new_debug_from_malloc(const char* fname, int line, const char* func_name)
-{
-   sObject* self = (sObject*)CheckMemLeak_Malloc(sizeof(sObject), fname, line, func_name);
-   
-   SBLOCK(self).mStatments = MALLOC(sizeof(sStatment)*1);
-   memset(SBLOCK(self).mStatments, 0, sizeof(sStatment)*1);
-   SBLOCK(self).mStatmentsNum = 0;
-   SBLOCK(self).mStatmentsSize = 1;
-   SBLOCK(self).mSource = NULL;
-
-   return self;
-}
-#else
-sObject* block_new_from_malloc()
-{
-   sObject* self = MALLOC(sizeof(sObject));
-   
-   SBLOCK(self).mStatments = MALLOC(sizeof(sStatment)*1);
-   memset(SBLOCK(self).mStatments, 0, sizeof(sStatment)*1);
-   SBLOCK(self).mStatmentsNum = 0;
-   SBLOCK(self).mStatmentsSize = 1;
-   SBLOCK(self).mSource = NULL;
-
-   return self;
-}
-#endif
-
 sObject* block_new_from_gc(BOOL user_object)
 {
    sObject* self = gc_get_free_object(T_BLOCK, user_object);
@@ -885,33 +688,6 @@ sObject* block_clone_gc(sObject* source, int type, BOOL user_object)
     return self;
 }
 
-sObject* block_clone_malloc(sObject* source)
-{
-    sObject* self = MALLOC(sizeof(sObject));
-
-    const int statments_size = SBLOCK(source).mStatmentsSize;
-    
-    SBLOCK(self).mStatments = MALLOC(sizeof(sStatment)*statments_size);
-    memset(SBLOCK(self).mStatments, 0, sizeof(sStatment)*statments_size);
-    SBLOCK(self).mStatmentsNum = SBLOCK(source).mStatmentsNum;
-    SBLOCK(self).mStatmentsSize = statments_size;
-    if(SBLOCK(source).mSource) {
-        SBLOCK(self).mSource = STRDUP(SBLOCK(source).mSource);
-    }
-    else {
-        SBLOCK(self).mSource = NULL;
-    }
-    SBLOCK(self).mCompletionFlags = SBLOCK(source).mCompletionFlags;
-
-    /// copy contents of all statments
-    int i;
-    for(i=0; i<SBLOCK(source).mStatmentsNum; i++) {
-        sStatment_copy_deeply_malloc(SBLOCK(self).mStatments + i, SBLOCK(source).mStatments + i);
-    }
-
-    return self;
-}
-
 sObject* block_clone_stack(sObject* source, int type)
 {
     sObject* self = stack_get_free_object(type);
@@ -974,19 +750,6 @@ void block_delete_stack(sObject* self)
     if(SBLOCK(self).mSource) FREE(SBLOCK(self).mSource);
 }
 
-void block_delete_malloc(sObject* self)
-{
-    int i;
-    for(i=0; i<SBLOCK(self).mStatmentsNum; i++) {
-        sStatment_delete_malloc(SBLOCK(self).mStatments + i);
-    }
-    FREE(SBLOCK(self).mStatments);
-
-    if(SBLOCK(self).mSource) FREE(SBLOCK(self).mSource);
-
-    FREE(self);
-}
-
 //////////////////////////////////////////////////////////////////////////
 // some functions
 /////////////////////////////////////////////////////////////////////////
@@ -1407,6 +1170,7 @@ BOOL sCommand_expand_env(sCommand* command, sObject* fun, sObject* nextin, sObje
                     char** tails;
                     if(!expand_glob(expanded_str, ALLOC &head, ALLOC &tails, command, runinfo->mSName, runinfo->mSLine))
                     {
+                        FREE(expanded_str);
                         return FALSE;
                     }
                     sCommand_add_arg_to_command2(command, MANAGED head);
@@ -1417,6 +1181,8 @@ BOOL sCommand_expand_env(sCommand* command, sObject* fun, sObject* nextin, sObje
                     }
                     FREE(tails);
                 }
+
+                FREE(expanded_str);
             }
             else {
                 char* expanded_str;
@@ -1498,6 +1264,8 @@ BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo*
                         p++;
                     }
                     FREE(tails);
+
+                    FREE(expanded_str);
                 }
                 else {
                     command->mRedirectsFileNamesRuntime[i] = MANAGED expanded_str;

--- a/src/cmd_base.c
+++ b/src/cmd_base.c
@@ -486,7 +486,7 @@ BOOL cmd_msleep(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
 
     if(command->mArgsNumRuntime == 2) {
-        /// ｽﾐﾎﾏ ///
+        /// ﾎｩ窶毒椎 ///
         char c [] = {'.', 'o', 'O'};
         int n = atoi(command->mArgsRuntime[1]);
         int i;
@@ -815,7 +815,7 @@ BOOL cmd_prompt(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
     if(command->mBlocksNum == 1) {
         gPrompt = block_clone_gc(command->mBlocks[0], T_BLOCK, FALSE);
-        uobject_put(gxyzshObject, "_prompt", gPrompt);
+        uobject_put(gXyzshObject, "_prompt", gPrompt);
         runinfo->mRCode = 0;
     }
 

--- a/src/cmd_str.c
+++ b/src/cmd_str.c
@@ -410,8 +410,8 @@ BOOL cmd_index(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             char* result = NULL;
             if(sCommand_option_item(command, "-ignore-case")) {
                 while(p < start_byte + strlen(start_byte)) {
-                    if(gxyzshSigInt) {
-                        gxyzshSigInt = FALSE;
+                    if(gXyzshSigInt) {
+                        gXyzshSigInt = FALSE;
                         err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                         runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
                         return FALSE;
@@ -432,8 +432,8 @@ BOOL cmd_index(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             }
             else {
                 while(p < start_byte + strlen(start_byte)) {
-                    if(gxyzshSigInt) {
-                        gxyzshSigInt = FALSE;
+                    if(gXyzshSigInt) {
+                        gXyzshSigInt = FALSE;
                         err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                         runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
                         return FALSE;
@@ -471,7 +471,7 @@ BOOL cmd_index(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 }
             }
 
-            /// ｽﾐﾎﾏ ///
+            /// ﾎｩ窶毒椎 ///
             if(!sCommand_option_item(command, "-quiet")) {
                 if(!fd_write(nextout, msg, size)) {
                     err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
@@ -503,9 +503,9 @@ static char* strstr_back(char* p, char* start, char* word, char* sname, int slin
                 break;
             }
 
-            if(gxyzshSigInt) {
+            if(gXyzshSigInt) {
                 err_msg("interrupt", sname, sline, command);
-                gxyzshSigInt = FALSE;
+                gXyzshSigInt = FALSE;
                 return NULL;
             }
         }
@@ -542,8 +542,8 @@ static char* strcasestr_back(char* p, char* start, char* word, char* sname, int
                 }
             }
 
-            if(gxyzshSigInt) {
-                gxyzshSigInt = FALSE;
+            if(gXyzshSigInt) {
+                gXyzshSigInt = FALSE;
                 err_msg("interrupt", sname, sline, command);
                 return NULL;
             }
@@ -629,8 +629,8 @@ BOOL cmd_rindex(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 while(p>=target) {
                     result = strcasestr_back(p, target, word, runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
 
-                    if(gxyzshSigInt) {
-                        gxyzshSigInt = FALSE;
+                    if(gXyzshSigInt) {
+                        gXyzshSigInt = FALSE;
                         err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                         runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
                         return FALSE;
@@ -652,8 +652,8 @@ BOOL cmd_rindex(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 while(p>=target) {
                     result = strstr_back(p, target, word, runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
 
-                    if(gxyzshSigInt) {
-                        gxyzshSigInt = FALSE;
+                    if(gXyzshSigInt) {
+                        gXyzshSigInt = FALSE;
                         err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                         runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
                         return FALSE;
@@ -690,7 +690,7 @@ BOOL cmd_rindex(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 }
             }
 
-            /// ｽﾐﾎﾏ ///
+            /// ﾎｩ窶毒椎 ///
             if(!sCommand_option_item(command, "-quiet")) {
                 if(!fd_write(nextout, msg, size)) {
                     err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);

--- /dev/null
+++ b/src/extprog.c
@@ -0,0 +1,32 @@
+#include "config.h"
+#include "xyzsh/xyzsh.h"
+#include <string.h>
+#include <stdio.h>
+
+sObject* external_prog_new_from_gc(char* path, BOOL user_object)
+{
+   sObject* self = gc_get_free_object(T_EXTPROG, user_object);
+   
+   SEXTPROG(self).mPath = STRDUP(path);
+
+   return self;
+}
+
+void external_prog_delete_gc(sObject* self)
+{
+    FREE(SEXTPROG(self).mPath);
+}
+
+sObject* extobj_new_from_gc(void* object, fExtObjMarkFun mark_fun, fExtObjFreeFun free_fun, fExtObjMainFun main_fun, BOOL user_object)
+{
+   sObject* self = gc_get_free_object(T_EXTOBJ, user_object);
+   
+   SEXTOBJ(self).mObject = object;
+   SEXTOBJ(self).mMarkFun = mark_fun;
+   SEXTOBJ(self).mFreeFun = free_fun;
+   SEXTOBJ(self).mMainFun = main_fun;
+
+   return self;
+}
+
+

--- /dev/null
+++ b/src/fd.c
@@ -0,0 +1,339 @@
+#include "config.h"
+#include "xyzsh/xyzsh.h"
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+sObject* fd_new_from_stack(int kind, int fd)
+{
+    sObject* self = stack_get_free_object(T_FD);
+
+    SFD(self).mKind = kind;
+
+    if(kind == kFDKindFD) {
+        SFD(self).fd.mFD = fd;
+    }
+    else {
+        SFD(self).fdbuf.mBuf = MALLOC(1024);
+        SFD(self).fdbuf.mBuf[0] = 0;
+
+        SFD(self).fdbuf.mBufSize = 1024;
+        SFD(self).fdbuf.mBufLen = 0;
+
+        SFD(self).fdbuf.mLines = VECTOR_NEW_MALLOC(32);
+        SFD(self).fdbuf.mReadedLineNumber = 0;
+    }
+
+    return self;
+}
+
+void fd_delete_stack(sObject* self)
+{
+    if(SFD(self).mKind == kFDKindBuf) {
+        sObject* v = SFD(self).fdbuf.mLines;
+        int i;
+        for(i=0; i<vector_count(v); i++) {
+            FREE(vector_item(v, i));
+        }
+        vector_delete_malloc(SFD(self).fdbuf.mLines);
+
+        FREE(SFD(self).fdbuf.mBuf);
+    }
+}
+
+// TRUE: Success
+// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
+BOOL bufsiz_write(int fd, char* buf, int buf_size)
+{
+    char* p = buf;
+    while(p - buf < buf_size) {
+        int size;
+        if(buf_size - (p - buf) < BUFSIZ) {
+            size = buf_size - (p-buf);
+        }
+        else {
+            size = BUFSIZ;
+        }
+
+        if(write(fd, p, size) < 0) {
+            if(errno == EINTR) {
+                while(!gXyzshSigInt);
+                gXyzshSigInt = FALSE;
+                return FALSE;
+            }
+            return FALSE;
+        }
+
+        if(gXyzshSigInt) {
+            gXyzshSigInt = FALSE;
+            return FALSE;
+        }
+
+        p+=size;
+    }
+
+    return TRUE;
+}
+
+BOOL fd_guess_lf(sObject* self, enum eLineField* lf)
+{
+    *lf = -1;
+    char* p = SFD(self).fdbuf.mBuf;
+
+    while(*p) {
+        if(*p == '\a') {
+            *lf = kBel;
+            return TRUE;
+        }
+        else {
+            p++;
+        }
+    }
+
+    if(*lf == -1) {
+        p = SFD(self).fdbuf.mBuf;
+
+        while(*p) {
+            if(*p == '\r' && *(p+1) == '\n') {
+                *lf = kCRLF;
+                return TRUE;
+            }
+            else {
+                p++;
+            }
+        }
+    }
+
+    if(*lf == -1) {
+        p = SFD(self).fdbuf.mBuf;
+
+        while(*p) {
+            if(*p == '\r') {
+                *lf = kCR;
+                return TRUE;
+            }
+            else {
+                p++;
+            }
+        }
+    }
+
+    if(*lf == -1) {
+        p = SFD(self).fdbuf.mBuf;
+
+        while(*p) {
+            if(*p == '\n') {
+                *lf = kLF;
+                return TRUE;
+            }
+            else {
+                p++;
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+void fd_split(sObject* self, enum eLineField lf)
+{
+    assert(TYPE(self) == T_FD && SFD(self).mKind == kFDKindBuf);
+
+    sObject* v = SFD(self).fdbuf.mLines;
+
+    if(SFD(self).fdbuf.mLinesLineField != lf) {
+        int i;
+        for(i=0; i<vector_count(v); i++) {
+            FREE(vector_item(v, i));
+        }
+        vector_clear(v);
+        SFD(self).fdbuf.mReadedLineNumber = 0;
+    }
+
+    if(vector_count(v) == 0) {
+        char* p = SFD(self).fdbuf.mBuf;
+        char* new_line = p;
+        if(lf == kCRLF) {
+            while(1) {
+                if(*p == '\r' && *(p+1) == '\n') {
+                    p+=2;
+                    const int size = p - new_line;
+                    char* line = MALLOC(size + 1);
+                    memcpy(line, new_line, size);
+                    line[size] = 0;
+                    vector_add(v, line);
+                    new_line = p;
+                }
+                else if(p - SFD(self).fdbuf.mBuf >= SFD(self).fdbuf.mBufLen) {
+                    const int size = p - new_line;
+                    if(size > 0) {
+                        char* line = MALLOC(size + 1 + 2);
+                        memcpy(line, new_line, size);
+                        line[size] = '\r';
+                        line[size+1] = '\n';
+                        line[size+2] = 0;
+                        vector_add(v, line);
+                    }
+                    break;
+                }
+                else {
+                    p++;
+                }
+            }
+        }
+        else {
+            char split_char;
+            if(lf == kLF) {
+                split_char = '\n';
+            }
+            else if(lf == kCR) {
+                split_char = '\r';
+            }
+            else {
+                split_char = '\a';
+            }
+
+            while(1) {
+                if(*p == split_char) {
+                    const int size = p - new_line + 1;
+                    char* line = MALLOC(size + 1);
+                    memcpy(line, new_line, size);
+                    line[size] = 0;
+                    vector_add(v, line);
+                    p++;
+                    new_line = p;
+                }
+                else if(p - SFD(self).fdbuf.mBuf >= SFD(self).fdbuf.mBufLen) {
+                    const int size = p - new_line;
+                    if(size > 0) {
+                        char* line = MALLOC(size + 1 + 1);
+                        memcpy(line, new_line, size);
+                        line[size] = split_char;
+                        line[size+1] = 0;
+                        vector_add(v, line);
+                    }
+                    break;
+                }
+                else {
+                    p++;
+                }
+            }
+        }
+
+        SFD(self).fdbuf.mLinesLineField = lf;
+    }
+}
+
+// TRUE: Success
+// FALSE: signal interrupt
+static BOOL memcpy_buf(char* dest, char* src, size_t size)
+{
+    char* p = dest;
+    char* p2 = src;
+    while(1) {
+        if(gXyzshSigInt) {
+            gXyzshSigInt = FALSE;
+            return FALSE;
+        }
+        if(size - (p - dest) < BUFSIZ) {
+            memcpy(p, p2, size - (p-dest));
+            break;
+        }
+        else {
+            memcpy(p, p2, BUFSIZ);
+            p+=BUFSIZ;
+            p2+=BUFSIZ;
+        }
+    }
+
+    return TRUE;
+}
+
+void fd_clear(sObject* self)
+{
+    assert(TYPE(self) == T_FD);
+
+    if(SFD(self).mKind == kFDKindBuf) {
+        SFD(self).fdbuf.mBufLen = 0;
+        SFD(self).fdbuf.mBuf[0] = 0;
+
+        int i;
+        for(i=0; i<vector_count(SFD(self).fdbuf.mLines); i++) {
+            FREE(vector_item(SFD(self).fdbuf.mLines, i));
+        }
+        vector_clear(SFD(self).fdbuf.mLines);
+        SFD(self).fdbuf.mReadedLineNumber = 0;
+    }
+}
+
+// TRUE: Success
+// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
+BOOL fd_write(sObject* self, char* str, int len)
+{
+    if(SFD(self).mKind == kFDKindFD) {
+        if(write(SFD(self).fd.mFD, str, len) < 0) {
+            return FALSE;
+        }
+    }
+    else {
+        if((SFD(self).fdbuf.mBufLen+len+1) >= SFD(self).fdbuf.mBufSize) {
+            int new_size = (SFD(self).fdbuf.mBufSize + len+1) * 1.8;
+
+            SFD(self).fdbuf.mBuf = REALLOC(SFD(self).fdbuf.mBuf, new_size);
+            SFD(self).fdbuf.mBufSize = new_size;
+        }
+
+
+        if(!memcpy_buf(SFD(self).fdbuf.mBuf + SFD(self).fdbuf.mBufLen, str, len)) {
+            return FALSE;
+        }
+        SFD(self).fdbuf.mBufLen += len;
+        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen] = 0;
+    }
+
+    return TRUE;
+}
+
+// TRUE: Success
+// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
+BOOL fd_writec(sObject* self, char c)
+{
+    if(SFD(self).mKind == kFDKindFD) {
+        if(write(SFD(self).fd.mFD, &c, 1) < 0) {
+            return FALSE;
+        }
+    }
+    else {
+        if((SFD(self).fdbuf.mBufLen) >= SFD(self).fdbuf.mBufSize) {
+            int new_size = (SFD(self).fdbuf.mBufSize) * 1.8;
+            SFD(self).fdbuf.mBuf = REALLOC(SFD(self).fdbuf.mBuf, new_size);
+            SFD(self).fdbuf.mBufSize = new_size;
+        }
+
+        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen++] = c;
+        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen] = 0;
+
+        if(gXyzshSigInt) {
+            gXyzshSigInt = FALSE;
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+// TRUE: Success
+// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
+BOOL fd_flash(sObject* self, int fd)
+{
+    if(SFD(self).mKind == kFDKindBuf) {
+        if(!bufsiz_write(fd, SFD(self).fdbuf.mBuf, SFD(self).fdbuf.mBufLen)) {
+            return FALSE;
+        }
+
+        SFD(self).fdbuf.mBufLen = 0;
+        SFD(self).fdbuf.mBuf[0] = 0;
+    }
+
+    return TRUE;
+}

--- a/src/gc.c
+++ b/src/gc.c
@@ -11,7 +11,7 @@ static sObject** gPool;
 static sObject* gFreeObjectHead;
 sObject* gRootObject;
 sObject* gCompletionObject;
-sObject* gxyzshObject;
+sObject* gXyzshObject;
 sObject* gCurrentObject;
 sObject* gMemChecker;
 sObject* gStackFrames;
@@ -203,21 +203,20 @@ void gc_init(int pool_size)
 
     uobject_put(gRootObject, "compl", gCompletionObject);
 
-    gxyzshObject = UOBJECT_NEW_GC(8, NULL, "xyzsh", FALSE);
+    gXyzshObject = UOBJECT_NEW_GC(8, NULL, "xyzsh", FALSE);
     gStackFrames = VECTOR_NEW_GC(8, FALSE);
-    uobject_put(gxyzshObject, "_stackframes", gStackFrames);
+    uobject_put(gXyzshObject, "_stackframes", gStackFrames);
 }
 
 void gc_final()
 {
     /// sweep all user objects ///
     uobject_clear(gRootObject);
-    uobject_clear(gxyzshObject);
+    uobject_clear(gXyzshObject);
     if(gAppType == kATConsoleApp) {
         printf("sweeped %d objects...\n", gc_sweep());
     }
 
-    /// delete container ///
     int i;
     for(i=0; i<gPoolSize; i++) {
         sObject* p = gPool[i];
@@ -232,42 +231,6 @@ void gc_final()
     FREE(gPool);
 }
 
-/*
-static int mark_objects_in_pipe(sObject* current_pipe)
-{
-    assert(TYPE(current_pipe) == T_FD);
-
-    int count = 0;
-
-    enum eLineField lf;
-    if(fd_guess_lf(current_pipe, &lf)) {
-        fd_split(current_pipe, lf);
-    }
-    else {
-        fd_split(current_pipe, kLF);
-    }
-
-    int i;
-    for(i=0; i<vector_count(SFD(current_pipe).fdbuf.mLines); i++) {
-        char* line = vector_item(SFD(current_pipe).fdbuf.mLines, i);
-        void* mem = (void*)(unsigned long)strtoll(line, NULL, 16);
-
-        int type = memchecker_item(gMemChecker, mem);
-
-        if(type >= 0) {
-            sObject* obj = mem;
-
-            obj->mFlg |= GC_MARK;
-            count++;
-
-            count += object_gc_children_mark(obj);
-        }
-    }
-
-    return count;
-}
-*/
-
 static int mark()
 {
     int i;
@@ -284,8 +247,8 @@ static int mark()
     gRootObject->mFlg |= GC_MARK;
     int count = uobject_gc_children_mark(gRootObject);
 
-    gxyzshObject->mFlg |= GC_MARK;
-    count += uobject_gc_children_mark(gxyzshObject);
+    gXyzshObject->mFlg |= GC_MARK;
+    count += uobject_gc_children_mark(gXyzshObject);
 
     return count;
 }

--- a/src/hash.c
+++ b/src/hash.c
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include "xyzsh/xyzsh.h"
 
 hash_it* hash_it_new(char* key, void* item, hash_it* coll_it, hash_it* next_it, sObject* hash) 
@@ -93,7 +92,8 @@ sObject* hash_new_from_stack(int size)
 
 void hash_delete_gc(sObject* self)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -107,7 +107,8 @@ void hash_delete_gc(sObject* self)
 
 void hash_delete_stack(sObject* self)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -121,7 +122,8 @@ void hash_delete_stack(sObject* self)
 
 void hash_delete_malloc(sObject* self)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -137,7 +139,7 @@ void hash_delete_malloc(sObject* self)
 
 static unsigned int get_hash_value(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    unsigned int i = 0;
    while(*key) {
@@ -150,7 +152,8 @@ static unsigned int get_hash_value(sObject* self, char* key)
 
 static void resize(sObject* self) 
 {
-    assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
     const int table_size = SHASH(self).mTableSize;
 
     SHASH(self).mTableSize *= 5;
@@ -172,7 +175,7 @@ static void resize(sObject* self)
 
 void hash_put(sObject* self, char* key, void* item)
 {
-    assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
     if(SHASH(self).mCounter >= SHASH(self).mTableSize) {
         resize(self);
@@ -199,7 +202,8 @@ void hash_put(sObject* self, char* key, void* item)
 
 static void erase_from_list(sObject* self, hash_it* rit)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    if(rit == SHASH(self).mEntryIt) {
       SHASH(self).mEntryIt = rit->mNextIt;
    }
@@ -219,7 +223,8 @@ static void erase_from_list(sObject* self, hash_it* rit)
 
 BOOL hash_erase(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    const unsigned int hash_value = get_hash_value(self, key);
    hash_it* it = SHASH(self).mTable[hash_value];
    
@@ -260,7 +265,8 @@ BOOL hash_erase(sObject* self, char* key)
 
 void hash_clear(sObject* self)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    int i;
    int max;
    hash_it* it = SHASH(self).mEntryIt;
@@ -279,7 +285,8 @@ void hash_clear(sObject* self)
 
 void hash_replace(sObject* self, char* key, void* item)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mTable[get_hash_value(self, key)];
 
    if(it) {
@@ -296,7 +303,7 @@ void hash_replace(sObject* self, char* key, void* item)
 
 void hash_show(sObject* self, char* fname)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    char tmp[8096];
    int i;
@@ -333,7 +340,7 @@ void hash_show(sObject* self, char* fname)
 
 void* hash_item(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    hash_it* it = SHASH(self).mTable[ get_hash_value(self, key) ];
 
@@ -347,7 +354,7 @@ void* hash_item(sObject* self, char* key)
 
 void* hash_item_addr(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    hash_it* it = SHASH(self).mTable[ get_hash_value(self, key) ];
    while(it) {
@@ -360,7 +367,7 @@ void* hash_item_addr(sObject* self, char* key)
    
 char* hash_key(sObject* self, void* item)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    hash_it* it = SHASH(self).mEntryIt;
 
@@ -374,14 +381,14 @@ char* hash_key(sObject* self, void* item)
 
 int hash_count(sObject* self)
 {
-   assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
    return SHASH(self).mCounter;
 }   
 
 hash_it* hash_loop_begin(sObject* self) 
 { 
-    assert(TYPE(self) == T_HASH); 
+   ASSERT(TYPE(self) == T_HASH);
 
     return SHASH(self).mEntryIt; 
 }
@@ -403,7 +410,7 @@ hash_it* hash_loop_next(hash_it* it)
 
 int hash_gc_children_mark(sObject* self)
 {
-    assert(TYPE(self) == T_HASH);
+   ASSERT(TYPE(self) == T_HASH);
 
     int count = 0;
 

--- a/src/interface.c
+++ b/src/interface.c
@@ -63,7 +63,7 @@ static char* prompt()
     xyzsh_set_signal();
 
     sObject* fun = FUN_NEW_STACK(NULL);
-    sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+    sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
     vector_add(gStackFrames, stackframe);
     //uobject_init(stackframe);
     SFUN(fun).mLocalObjects = stackframe;
@@ -109,7 +109,7 @@ BOOL xyzsh_run(int* rcode, sObject* block, char* source_name, fXyzshJobDone xyzs
     xyzsh_set_signal();
 
     sObject* fun = FUN_NEW_STACK(NULL);
-    sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+    sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
     vector_add(gStackFrames, stackframe);
     //uobject_init(stackframe);
     SFUN(fun).mLocalObjects = stackframe;
@@ -269,7 +269,7 @@ BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_poin
             xyzsh_set_signal();
 
             sObject* fun = FUN_NEW_STACK(NULL);
-            sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+            sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
             vector_add(gStackFrames, stackframe);
             //uobject_init(stackframe);
             SFUN(fun).mLocalObjects = stackframe;
@@ -429,7 +429,7 @@ void xyzsh_readline_interface(char* cmdline, int cursor_point, char** argv, int
                 xyzsh_set_signal();
 
                 sObject* fun = FUN_NEW_STACK(NULL);
-                sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+                sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
                 vector_add(gStackFrames, stackframe);
                 //uobject_init(stackframe);
                 SFUN(fun).mLocalObjects = stackframe;
@@ -539,7 +539,7 @@ void xyzsh_opt_c(char* cmd, char** argv, int argc)
         xyzsh_set_signal_optc();
 
         sObject* fun = FUN_NEW_STACK(NULL);
-        sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
         vector_add(gStackFrames, stackframe);
         //uobject_init(stackframe);
         SFUN(fun).mLocalObjects = stackframe;

--- /dev/null
+++ b/src/nfun.c
@@ -0,0 +1,102 @@
+#include "config.h"
+#include "xyzsh/xyzsh.h"
+#include <string.h>
+#include <stdio.h>
+
+sObject* nfun_new_from_gc(fXyzshNativeFun fun, sObject* parent, BOOL user_object)
+{
+   sObject* self = gc_get_free_object(T_NFUN, user_object);
+   
+   SNFUN(self).mNativeFun = fun;
+   SNFUN(self).mParent = parent;
+
+   SNFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
+   memset(SNFUN(self).mOptions,0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
+
+   return self;
+}
+
+void nfun_delete_gc(sObject* self)
+{
+    int i;
+    for(i=0; i<XYZSH_OPTION_MAX; i++) {
+        if(SNFUN(self).mOptions[i].mKey) { FREE(SNFUN(self).mOptions[i].mKey); }
+        if(SNFUN(self).mOptions[i].mArg) { FREE(SNFUN(self).mOptions[i].mArg); }
+    }
+    FREE(SNFUN(self).mOptions);
+}
+
+static int options_hash_fun(char* key)
+{
+    int value = 0;
+    while(*key) {
+        value += *key;
+        key++;
+    }
+    return value % XYZSH_OPTION_MAX;
+}
+
+BOOL nfun_put_option_with_argument(sObject* self, MANAGED char* key)
+{
+    int hash_value = options_hash_fun(key);
+
+    option_hash_it* p = SNFUN(self).mOptions + hash_value;
+    while(1) {
+        if(p->mKey) {
+            p++;
+            if(p == SNFUN(self).mOptions + hash_value) {
+                return FALSE;
+            }
+            else if(p == SNFUN(self).mOptions + XYZSH_OPTION_MAX) {
+                p = SNFUN(self).mOptions;
+            }
+        }
+        else {
+            p->mKey = MANAGED key;
+            return TRUE;
+        }
+    }
+}
+
+BOOL nfun_option_with_argument_item(sObject* self, char* key)
+{
+    int hash_value = options_hash_fun(key);
+    option_hash_it* p = SNFUN(self).mOptions + hash_value;
+
+    while(1) {
+        if(p->mKey) {
+            if(strcmp(p->mKey, key) == 0) {
+                return TRUE;
+            }
+            else {
+                p++;
+                if(p == SNFUN(self).mOptions + hash_value) {
+                    return FALSE;
+                }
+                else if(p == SNFUN(self).mOptions + XYZSH_OPTION_MAX) {
+                    p = SNFUN(self).mOptions;
+                }
+            }
+        }
+        else {
+            return FALSE;
+        }
+    }
+}
+
+int nfun_gc_children_mark(sObject* self)
+{
+    int count = 0;
+
+    sObject* parent = SNFUN(self).mParent;
+    if(parent) {
+        if((parent->mFlg & GC_MARK) == 0) {
+            parent->mFlg |= GC_MARK;
+            count++;
+            count += object_gc_children_mark(parent);
+        }
+    }
+
+    return count;
+}
+

--- a/src/object.c
+++ b/src/object.c
@@ -3,103 +3,6 @@
 #include <string.h>
 #include <stdio.h>
 
-sObject* nfun_new_from_gc(fXyzshNativeFun fun, sObject* parent, BOOL user_object)
-{
-   sObject* self = gc_get_free_object(T_NFUN, user_object);
-   
-   SNFUN(self).mNativeFun = fun;
-   SNFUN(self).mParent = parent;
-
-   SNFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
-   memset(SNFUN(self).mOptions,0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
-
-   return self;
-}
-
-void nfun_delete_gc(sObject* self)
-{
-    int i;
-    for(i=0; i<XYZSH_OPTION_MAX; i++) {
-        if(SNFUN(self).mOptions[i].mKey) { FREE(SNFUN(self).mOptions[i].mKey); }
-        if(SNFUN(self).mOptions[i].mArg) { FREE(SNFUN(self).mOptions[i].mArg); }
-    }
-    FREE(SNFUN(self).mOptions);
-}
-
-static int options_hash_fun(char* key)
-{
-    int value = 0;
-    while(*key) {
-        value += *key;
-        key++;
-    }
-    return value % XYZSH_OPTION_MAX;
-}
-
-BOOL nfun_put_option_with_argument(sObject* self, MANAGED char* key)
-{
-    int hash_value = options_hash_fun(key);
-
-    option_hash_it* p = SNFUN(self).mOptions + hash_value;
-    while(1) {
-        if(p->mKey) {
-            p++;
-            if(p == SNFUN(self).mOptions + hash_value) {
-                return FALSE;
-            }
-            else if(p == SNFUN(self).mOptions + XYZSH_OPTION_MAX) {
-                p = SNFUN(self).mOptions;
-            }
-        }
-        else {
-            p->mKey = MANAGED key;
-            return TRUE;
-        }
-    }
-}
-
-BOOL nfun_option_with_argument_item(sObject* self, char* key)
-{
-    int hash_value = options_hash_fun(key);
-    option_hash_it* p = SNFUN(self).mOptions + hash_value;
-
-    while(1) {
-        if(p->mKey) {
-            if(strcmp(p->mKey, key) == 0) {
-                return TRUE;
-            }
-            else {
-                p++;
-                if(p == SNFUN(self).mOptions + hash_value) {
-                    return FALSE;
-                }
-                else if(p == SNFUN(self).mOptions + XYZSH_OPTION_MAX) {
-                    p = SNFUN(self).mOptions;
-                }
-            }
-        }
-        else {
-            return FALSE;
-        }
-    }
-}
-
-int nfun_gc_children_mark(sObject* self)
-{
-    int count = 0;
-
-    sObject* parent = SNFUN(self).mParent;
-    if(parent) {
-        if((parent->mFlg & GC_MARK) == 0) {
-            parent->mFlg |= GC_MARK;
-            count++;
-            count += object_gc_children_mark(parent);
-        }
-    }
-
-    return count;
-}
-
 sObject* access_object(char* name, sObject** current, sObject* running_object)
 {
     sObject* object;
@@ -137,29 +40,3 @@ sObject* access_object3(char* name, sObject** current)
         *current = SUOBJECT((*current)).mParent;
     }
 }
-
-sObject* external_prog_new_from_gc(char* path, BOOL user_object)
-{
-   sObject* self = gc_get_free_object(T_EXTPROG, user_object);
-   
-   SEXTPROG(self).mPath = STRDUP(path);
-
-   return self;
-}
-
-void external_prog_delete_gc(sObject* self)
-{
-    FREE(SEXTPROG(self).mPath);
-}
-
-sObject* extobj_new_from_gc(void* object, fExtObjMarkFun mark_fun, fExtObjFreeFun free_fun, BOOL user_object)
-{
-   sObject* self = gc_get_free_object(T_EXTOBJ, user_object);
-   
-   SEXTOBJ(self).mObject = object;
-   SEXTOBJ(self).mMarkFun = mark_fun;
-   SEXTOBJ(self).mFreeFun = free_fun;
-
-   return self;
-}
-

--- a/src/parser.c
+++ b/src/parser.c
@@ -256,7 +256,6 @@ static BOOL read_env(char** p, sBuf* buf, char* sname, int* sline, BOOL expand_q
 
 static BOOL add_argument_to_command(sBuf* buf, sCommand* command, char* sname, int* sline);
 
-/// 一単語読み込み
 static BOOL read_one_argument(char** p, sBuf* buf, char* sname, int* sline, BOOL expand_quote, sCommand* command, sObject* block, sObject** current_object)
 {
     BOOL squote = FALSE;
@@ -381,7 +380,7 @@ static BOOL read_one_argument(char** p, sBuf* buf, char* sname, int* sline, BOOL
                         return FALSE;
                     }
                 }
-                else if(gxyzshSigInt) {
+                else if(gXyzshSigInt) {
                     err_msg("signal interrupt", sname, *sline, "here document");
                     return FALSE;
                 }
@@ -655,7 +654,6 @@ void tilda_expasion(char* file, ALLOC char** file2)
     *file2 = STRDUP(result);
 }
 
-
 static BOOL read_statment(char**p, sStatment* statment, sObject* block, char* sname, int* sline, sObject** current_object);
 
 // result --> TRUE: success
@@ -1012,7 +1010,7 @@ static BOOL read_statment(char**p, sStatment* statment, sObject* block, char* sn
 }
 
 // result --> TRUE: success
-// result --> FALSE: There is a error message on gErrMsg. Please output the error message and stop running
+// result --> FALSE: There is an error message on gErrMsg. Please output the error message and stop running
 BOOL parse(char* p, char* sname, int* sline, sObject* block, sObject** current_object)
 {
     SBLOCK(block).mSource = STRDUP(p);

--- a/src/readline.c
+++ b/src/readline.c
@@ -570,7 +570,7 @@ char** readline_on_complete(const char* text, int start, int end)
                 sObject* nextout = FD_NEW_STACK(kFDKindBuf, 0);
 
                 sObject* fun = FUN_NEW_STACK(NULL);
-                sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+                sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
                 vector_add(gStackFrames, stackframe);
                 //uobject_init(stackframe);
                 SFUN(fun).mLocalObjects = stackframe;
@@ -722,7 +722,7 @@ BOOL cmd_completion(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                         stack_start_stack();
 
                         sObject* fun = FUN_NEW_STACK(NULL);
-                        sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+                        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
                         vector_add(gStackFrames, stackframe);
                         //uobject_init(stackframe);
                         SFUN(fun).mLocalObjects = stackframe;
@@ -877,7 +877,7 @@ static int readline_macro(int count, int key)
         xyzsh_set_signal();
 
         sObject* fun = FUN_NEW_STACK(NULL);
-        sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
         vector_add(gStackFrames, stackframe);
         //uobject_init(stackframe);
         SFUN(fun).mLocalObjects = stackframe;

--- a/src/run.c
+++ b/src/run.c
@@ -25,7 +25,9 @@ sObject* gStderr;
 
 sObject* gGlobalPipe;
 
-sObject* gObjectsInPipe;
+static sObject* gObjectsInPipe;
+
+static sObject* gRunningObjects;
 
 BOOL add_object_to_objects_in_pipe(sObject* object, sRunInfo* runinfo, sCommand* command)
 {
@@ -53,7 +55,7 @@ void run_init(enum eAppType app_type)
     gStdout = FD_NEW_STACK(kFDKindBuf, 0);
     gStderr = FD_NEW_STACK(kFDKindBuf, 0);
     gJobs = VECTOR_NEW_GC(16, FALSE);
-    uobject_put(gxyzshObject, "_jobs", gJobs);
+    uobject_put(gXyzshObject, "_jobs", gJobs);
 
     xyzsh_job_done = NULL;
 
@@ -63,345 +65,14 @@ void run_init(enum eAppType app_type)
     gGlobalPipe = FD_NEW_STACK(kFDKindBuf, 0);
 
     gObjectsInPipe = VECTOR_NEW_GC(10, FALSE);
-    uobject_put(gxyzshObject, "_objects_in_pipe", gObjectsInPipe);
-}
-
-void run_final()
-{
-}
-
-sObject* fd_new_from_stack(int kind, int fd)
-{
-    sObject* self = stack_get_free_object(T_FD);
-
-    SFD(self).mKind = kind;
-
-    if(kind == kFDKindFD) {
-        SFD(self).fd.mFD = fd;
-    }
-    else {
-        SFD(self).fdbuf.mBuf = MALLOC(1024);
-        SFD(self).fdbuf.mBuf[0] = 0;
-
-        SFD(self).fdbuf.mBufSize = 1024;
-        SFD(self).fdbuf.mBufLen = 0;
-
-        SFD(self).fdbuf.mLines = VECTOR_NEW_MALLOC(32);
-        SFD(self).fdbuf.mReadedLineNumber = 0;
-    }
-
-    return self;
-}
-
-void fd_delete_stack(sObject* self)
-{
-    if(SFD(self).mKind == kFDKindBuf) {
-        sObject* v = SFD(self).fdbuf.mLines;
-        int i;
-        for(i=0; i<vector_count(v); i++) {
-            FREE(vector_item(v, i));
-        }
-        vector_delete_malloc(SFD(self).fdbuf.mLines);
-
-        FREE(SFD(self).fdbuf.mBuf);
-    }
-}
-
-// TRUE: Success
-// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
-BOOL bufsiz_write(int fd, char* buf, int buf_size)
-{
-    char* p = buf;
-    while(p - buf < buf_size) {
-        int size;
-        if(buf_size - (p - buf) < BUFSIZ) {
-            size = buf_size - (p-buf);
-        }
-        else {
-            size = BUFSIZ;
-        }
-
-        if(write(fd, p, size) < 0) {
-            if(errno == EINTR) {
-                while(!gxyzshSigInt);
-                gxyzshSigInt = FALSE;
-                return FALSE;
-            }
-            return FALSE;
-        }
-
-        if(gxyzshSigInt) {
-            gxyzshSigInt = FALSE;
-            return FALSE;
-        }
-
-        p+=size;
-    }
-
-    return TRUE;
-}
-
-BOOL fd_guess_lf(sObject* self, enum eLineField* lf)
-{
-    *lf = -1;
-    char* p = SFD(self).fdbuf.mBuf;
-
-    while(*p) {
-        if(*p == '\a') {
-            *lf = kBel;
-            return TRUE;
-        }
-        else {
-            p++;
-        }
-    }
-
-    if(*lf == -1) {
-        p = SFD(self).fdbuf.mBuf;
-
-        while(*p) {
-            if(*p == '\r' && *(p+1) == '\n') {
-                *lf = kCRLF;
-                return TRUE;
-            }
-            else {
-                p++;
-            }
-        }
-    }
-
-    if(*lf == -1) {
-        p = SFD(self).fdbuf.mBuf;
-
-        while(*p) {
-            if(*p == '\r') {
-                *lf = kCR;
-                return TRUE;
-            }
-            else {
-                p++;
-            }
-        }
-    }
-
-    if(*lf == -1) {
-        p = SFD(self).fdbuf.mBuf;
-
-        while(*p) {
-            if(*p == '\n') {
-                *lf = kLF;
-                return TRUE;
-            }
-            else {
-                p++;
-            }
-        }
-    }
-
-    return FALSE;
-}
-
-void fd_split(sObject* self, enum eLineField lf)
-{
-    assert(TYPE(self) == T_FD && SFD(self).mKind == kFDKindBuf);
-
-    sObject* v = SFD(self).fdbuf.mLines;
-
-    if(SFD(self).fdbuf.mLinesLineField != lf) {
-        int i;
-        for(i=0; i<vector_count(v); i++) {
-            FREE(vector_item(v, i));
-        }
-        vector_clear(v);
-        SFD(self).fdbuf.mReadedLineNumber = 0;
-    }
-
-    if(vector_count(v) == 0) {
-        char* p = SFD(self).fdbuf.mBuf;
-        char* new_line = p;
-        if(lf == kCRLF) {
-            while(1) {
-                if(*p == '\r' && *(p+1) == '\n') {
-                    p+=2;
-                    const int size = p - new_line;
-                    char* line = MALLOC(size + 1);
-                    memcpy(line, new_line, size);
-                    line[size] = 0;
-                    vector_add(v, line);
-                    new_line = p;
-                }
-                else if(p - SFD(self).fdbuf.mBuf >= SFD(self).fdbuf.mBufLen) {
-                    const int size = p - new_line;
-                    if(size > 0) {
-                        char* line = MALLOC(size + 1 + 2);
-                        memcpy(line, new_line, size);
-                        line[size] = '\r';
-                        line[size+1] = '\n';
-                        line[size+2] = 0;
-                        vector_add(v, line);
-                    }
-                    break;
-                }
-                else {
-                    p++;
-                }
-            }
-        }
-        else {
-            char split_char;
-            if(lf == kLF) {
-                split_char = '\n';
-            }
-            else if(lf == kCR) {
-                split_char = '\r';
-            }
-            else {
-                split_char = '\a';
-            }
-
-            while(1) {
-                if(*p == split_char) {
-                    const int size = p - new_line + 1;
-                    char* line = MALLOC(size + 1);
-                    memcpy(line, new_line, size);
-                    line[size] = 0;
-                    vector_add(v, line);
-                    p++;
-                    new_line = p;
-                }
-                else if(p - SFD(self).fdbuf.mBuf >= SFD(self).fdbuf.mBufLen) {
-                    const int size = p - new_line;
-                    if(size > 0) {
-                        char* line = MALLOC(size + 1 + 1);
-                        memcpy(line, new_line, size);
-                        line[size] = split_char;
-                        line[size+1] = 0;
-                        vector_add(v, line);
-                    }
-                    break;
-                }
-                else {
-                    p++;
-                }
-            }
-        }
-
-        SFD(self).fdbuf.mLinesLineField = lf;
-    }
-}
-
-// TRUE: Success
-// FALSE: signal interrupt
-static BOOL memcpy_buf(char* dest, char* src, size_t size)
-{
-    char* p = dest;
-    char* p2 = src;
-    while(1) {
-        if(gxyzshSigInt) {
-            gxyzshSigInt = FALSE;
-            return FALSE;
-        }
-        if(size - (p - dest) < BUFSIZ) {
-            memcpy(p, p2, size - (p-dest));
-            break;
-        }
-        else {
-            memcpy(p, p2, BUFSIZ);
-            p+=BUFSIZ;
-            p2+=BUFSIZ;
-        }
-    }
-
-    return TRUE;
-}
-
-void fd_clear(sObject* self)
-{
-    assert(TYPE(self) == T_FD);
-
-    if(SFD(self).mKind == kFDKindBuf) {
-        SFD(self).fdbuf.mBufLen = 0;
-        SFD(self).fdbuf.mBuf[0] = 0;
-
-        int i;
-        for(i=0; i<vector_count(SFD(self).fdbuf.mLines); i++) {
-            FREE(vector_item(SFD(self).fdbuf.mLines, i));
-        }
-        vector_clear(SFD(self).fdbuf.mLines);
-        SFD(self).fdbuf.mReadedLineNumber = 0;
-    }
-}
-
-// TRUE: Success
-// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
-BOOL fd_write(sObject* self, char* str, int len)
-{
-    if(SFD(self).mKind == kFDKindFD) {
-        if(write(SFD(self).fd.mFD, str, len) < 0) {
-            return FALSE;
-        }
-    }
-    else {
-        if((SFD(self).fdbuf.mBufLen+len+1) >= SFD(self).fdbuf.mBufSize) {
-            int new_size = (SFD(self).fdbuf.mBufSize + len+1) * 1.8;
-
-            SFD(self).fdbuf.mBuf = REALLOC(SFD(self).fdbuf.mBuf, new_size);
-            SFD(self).fdbuf.mBufSize = new_size;
-        }
-
-
-        if(!memcpy_buf(SFD(self).fdbuf.mBuf + SFD(self).fdbuf.mBufLen, str, len)) {
-            return FALSE;
-        }
-        SFD(self).fdbuf.mBufLen += len;
-        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen] = 0;
-    }
-
-    return TRUE;
-}
-
-// TRUE: Success
-// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
-BOOL fd_writec(sObject* self, char c)
-{
-    if(SFD(self).mKind == kFDKindFD) {
-        if(write(SFD(self).fd.mFD, &c, 1) < 0) {
-            return FALSE;
-        }
-    }
-    else {
-        if((SFD(self).fdbuf.mBufLen) >= SFD(self).fdbuf.mBufSize) {
-            int new_size = (SFD(self).fdbuf.mBufSize) * 1.8;
-            SFD(self).fdbuf.mBuf = REALLOC(SFD(self).fdbuf.mBuf, new_size);
-            SFD(self).fdbuf.mBufSize = new_size;
-        }
-
-        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen++] = c;
-        SFD(self).fdbuf.mBuf[SFD(self).fdbuf.mBufLen] = 0;
+    uobject_put(gXyzshObject, "_objects_in_pipe", gObjectsInPipe);
 
-        if(gxyzshSigInt) {
-            gxyzshSigInt = FALSE;
-            return FALSE;
-        }
-    }
-
-    return TRUE;
+    gRunningObjects = VECTOR_NEW_GC(10, FALSE);
+    uobject_put(gXyzshObject, "_running_block", gRunningObjects);
 }
 
-// TRUE: Success
-// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
-BOOL fd_flash(sObject* self, int fd)
+void run_final()
 {
-    if(SFD(self).mKind == kFDKindBuf) {
-        if(!bufsiz_write(fd, SFD(self).fdbuf.mBuf, SFD(self).fdbuf.mBufLen)) {
-            return FALSE;
-        }
-
-        SFD(self).fdbuf.mBufLen = 0;
-        SFD(self).fdbuf.mBuf[0] = 0;
-    }
-
-    return TRUE;
 }
 
 sObject* job_new_from_gc(char* name, pid_t pgroup, struct termios tty)
@@ -426,9 +97,9 @@ static BOOL nextout_reader(sObject* nextout, int* pipeoutfds, sRunInfo* runinfo,
 {
     char buf[BUFSIZ+1];
     while(1) {
-        if(gxyzshSigInt) {
+        if(gXyzshSigInt) {
             err_msg("signal interrupt1", runinfo->mSName, runinfo->mSLine, program);
-            gxyzshSigInt = FALSE;
+            gXyzshSigInt = FALSE;
             runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
             return FALSE;
         }
@@ -910,7 +581,7 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
     sRunInfo* runinfo2 = SFUN(fun).mRunInfo;
     SFUN(fun).mRunInfo = runinfo;
 
-    sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+    sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
     vector_add(gStackFrames, stackframe);
     //uobject_init(stackframe);
     SFUN(fun).mLocalObjects = stackframe;
@@ -1130,6 +801,17 @@ static BOOL run_object(sObject* object, sObject* nextin, sObject* nextout, sRunI
             }
             break;
 
+        case T_EXTOBJ: { 
+            if(SEXTOBJ(object).mMainFun) {
+                if(!SEXTOBJ(object)
+                      .mMainFun(SEXTOBJ(object).mObject, nextin, nextout, runinfo))
+                {
+                    return FALSE;
+                }   
+            }
+            }
+            break;
+
         default: {
             char buf[BUFSIZ];
             sCommand* command = runinfo->mCommand;
@@ -1393,7 +1075,7 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
                     reciever = object;
                     object = uobject_item(object, command->mArgs[0]);
 
-                    if(object == gInherit) {
+                    if(object == gInheritObject) {
                         sObject* running_object = runinfo->mRunningObject;
 
                         if(runinfo->mRunningObject) {
@@ -1459,7 +1141,7 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
                 sObject* reciever = current_object;
                 sObject* object = access_object(command->mArgs[0], &reciever, runinfo->mRunningObject);
 
-                if(object == gInherit) {
+                if(object == gInheritObject) {
                     sObject* running_object = runinfo->mRunningObject;
 
                     if(runinfo->mRunningObject) {
@@ -1546,6 +1228,9 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
 
 BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject* current_object, sObject* running_object)
 {
+    vector_add(gRunningObjects, running_object); // for marking on gc
+    vector_add(gRunningObjects, block); // for marking on gc
+
     static unsigned int n = 0;
     static int nest_level = 0;
     nest_level++;
@@ -1559,6 +1244,8 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
         }
         nest_level--;
 
+        (void)vector_pop_back(gRunningObjects);
+        (void)vector_pop_back(gRunningObjects);
         return FALSE;
     }
 
@@ -1594,6 +1281,8 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
 
             if(!(n++ % 32)) (void)gc_sweep();
 
+            (void)vector_pop_back(gRunningObjects);
+            (void)vector_pop_back(gRunningObjects);
             return FALSE;
         }
 
@@ -1612,6 +1301,8 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
                     vector_clear(gObjectsInPipe);
                 }
                 if(!(n++ % 32)) (void)gc_sweep();
+                (void)vector_pop_back(gRunningObjects);
+                (void)vector_pop_back(gRunningObjects);
                 return FALSE;
             }
         }
@@ -1630,13 +1321,15 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
                     vector_clear(gObjectsInPipe);
                 }
                 if(!(n++ % 32)) (void)gc_sweep();
+                (void)vector_pop_back(gRunningObjects);
+                (void)vector_pop_back(gRunningObjects);
                 return FALSE;
             }
         }
 
         /// the end of statment ///
-        if(gxyzshSigUser) {
-            gxyzshSigUser = FALSE;
+        if(gXyzshSigUser) {
+            gXyzshSigUser = FALSE;
             sCommand* command = runinfo.mCommand;
             err_msg("command not found", runinfo.mSName, runinfo.mSLine, ""); //command->mArgs[0]);
             stack_end_stack();
@@ -1647,10 +1340,12 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
                 vector_clear(gObjectsInPipe);
             }
             if(!(n++ % 32)) (void)gc_sweep();
+            (void)vector_pop_back(gRunningObjects);
+            (void)vector_pop_back(gRunningObjects);
             return FALSE;
         }
-        else if(runinfo.mRCode == 128+SIGINT || gxyzshSigInt) {
-            gxyzshSigInt = FALSE;
+        else if(runinfo.mRCode == 128+SIGINT || gXyzshSigInt) {
+            gXyzshSigInt = FALSE;
             sCommand* command = runinfo.mCommand;
             err_msg("signal interrupt15", runinfo.mSName, runinfo.mSLine, command->mArgs[0]);
             *rcode = RCODE_SIGNAL_INTERRUPT;
@@ -1662,6 +1357,8 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
                 vector_clear(gObjectsInPipe);
             }
             if(!(n++ % 32)) (void)gc_sweep();
+            (void)vector_pop_back(gRunningObjects);
+            (void)vector_pop_back(gRunningObjects);
             return FALSE;
         }
         else if((statment->mFlags & STATMENT_OROR) && runinfo.mRCode == 0) {
@@ -1692,6 +1389,8 @@ BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject*
     }
     if(!(n++ % 32)) (void)gc_sweep();
 
+    (void)vector_pop_back(gRunningObjects);
+    (void)vector_pop_back(gRunningObjects);
     return TRUE;
 }
 
@@ -1880,7 +1579,7 @@ BOOL load_file(char* fname, sObject* nextin, sObject* nextout, sRunInfo* runinfo
         FREE(buf);
 
         sObject* fun = FUN_NEW_STACK(NULL);
-        sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
         vector_add(gStackFrames, stackframe);
         //uobject_init(stackframe);
         SFUN(fun).mLocalObjects = stackframe;

--- a/src/string.c
+++ b/src/string.c
@@ -5,9 +5,9 @@
 #include "config.h"
 #include "xyzsh/xyzsh.h"
 
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 // Initialization
-//////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 #ifndef MDEBUG
 sObject* string_new_from_malloc(char* str)
 {
@@ -93,9 +93,9 @@ sObject* string_new_from_stack(char* str)
     return self;
 }
 
-//////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////
 // Finalization
-//////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////
 void string_delete_malloc(sObject* self)
 {
     FREE(SSTRING(self).mStr);
@@ -113,9 +113,9 @@ void string_delete_stack(sObject* self)
     FREE(SSTRING(self).mStr);
 }
 
-//////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////
 // Some functions
-//////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////
 void string_insert(sObject* self, int pos, char* str)
 {
     char* new_str;

--- a/src/uobject.c
+++ b/src/uobject.c
@@ -2,7 +2,6 @@
 #include "xyzsh/xyzsh.h"
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
 
 static unsigned int get_uobject_value(sObject* self, char* key)
 {
@@ -97,11 +96,11 @@ sObject* uobject_new_from_stack(int size, sObject* parent, char* name)
    return self;
 }
 
-sObject* gInherit;
+sObject* gInheritObject;
 
 void uobject_root_init(sObject* self)
 {
-    assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
     uobject_put(self, "unset", NFUN_NEW_GC(cmd_unset, NULL, TRUE));
     sObject* readline = UOBJECT_NEW_GC(8, self, "rl", TRUE);
@@ -136,8 +135,8 @@ void uobject_root_init(sObject* self)
     uobject_put(self, "write", NFUN_NEW_GC(cmd_write, NULL, TRUE));
     uobject_put(self, "quote", NFUN_NEW_GC(cmd_quote, NULL, TRUE));
     uobject_put(self, "load", NFUN_NEW_GC(cmd_load, NULL, TRUE));
-    gInherit = NFUN_NEW_GC(cmd_inherit, NULL, TRUE);
-    uobject_put(self, "inherit", gInherit);
+    gInheritObject = NFUN_NEW_GC(cmd_inherit, NULL, TRUE);
+    uobject_put(self, "inherit", gInheritObject);
     uobject_put(self, "eval", NFUN_NEW_GC(cmd_eval, NULL, TRUE));
     uobject_put(self, "object", NFUN_NEW_GC(cmd_object, NULL, TRUE));
     uobject_put(self, "pwo", NFUN_NEW_GC(cmd_pwo, NULL, TRUE));
@@ -276,7 +275,7 @@ void uobject_root_init(sObject* self)
 
 void uobject_init(sObject* self)
 {
-    assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
     uobject_put(self, "run", NFUN_NEW_GC(cmd_mrun, NULL, FALSE));
     uobject_put(self, "self", self);
@@ -287,7 +286,7 @@ void uobject_init(sObject* self)
 
 void uobject_delete_gc(sObject* self)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
    uobject_it* it = SUOBJECT(self).mEntryIt;
 
@@ -303,7 +302,7 @@ void uobject_delete_gc(sObject* self)
 
 void uobject_delete_stack(sObject* self)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
    uobject_it* it = SUOBJECT(self).mEntryIt;
 
@@ -319,7 +318,7 @@ void uobject_delete_stack(sObject* self)
 
 int uobject_gc_children_mark(sObject* self)
 {
-    assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
     int count = 0;
 
@@ -342,7 +341,7 @@ int uobject_gc_children_mark(sObject* self)
 
 void uobject_put(sObject* self, char* key, void* item)
 {
-    assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
     if(SUOBJECT(self).mCounter >= SUOBJECT(self).mTableSize) {
         resize(self);
@@ -369,7 +368,7 @@ void uobject_put(sObject* self, char* key, void* item)
 
 void* uobject_item(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
    uobject_it* it = SUOBJECT(self).mTable[ get_uobject_value(self, key) ];
 
@@ -383,7 +382,7 @@ void* uobject_item(sObject* self, char* key)
 
 void uobject_clear(sObject* self)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
    int i;
    int max;
@@ -403,7 +402,7 @@ void uobject_clear(sObject* self)
 
 uobject_it* uobject_loop_begin(sObject* self) 
 { 
-    assert(TYPE(self) == T_UOBJECT); 
+    ASSERT(TYPE(self) == T_UOBJECT);
 
     return SUOBJECT(self).mEntryIt; 
 }
@@ -425,14 +424,15 @@ uobject_it* uobject_loop_next(uobject_it* it)
 
 int uobject_count(sObject* self)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
 
    return SUOBJECT(self).mCounter;
 }
 
 static void erase_from_list(sObject* self, uobject_it* rit)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
+
    if(rit == SUOBJECT(self).mEntryIt) {
       SUOBJECT(self).mEntryIt = rit->mNextIt;
    }
@@ -452,7 +452,7 @@ static void erase_from_list(sObject* self, uobject_it* rit)
 
 BOOL uobject_erase(sObject* self, char* key)
 {
-   assert(TYPE(self) == T_UOBJECT);
+    ASSERT(TYPE(self) == T_UOBJECT);
    const unsigned int hash_value = get_uobject_value(self, key);
    uobject_it* it = SUOBJECT(self).mTable[hash_value];
    

--- a/src/xyzsh.c
+++ b/src/xyzsh.c
@@ -9,10 +9,10 @@
 
 sObject* gErrMsg;
 
-volatile BOOL gxyzshSigInt;
-volatile BOOL gxyzshSigUser;
-volatile BOOL gxyzshSigTstp;
-volatile BOOL gxyzshSigCont;
+volatile BOOL gXyzshSigInt;
+volatile BOOL gXyzshSigUser;
+volatile BOOL gXyzshSigTstp;
+volatile BOOL gXyzshSigCont;
 
 sObject* gDirStack;
 
@@ -57,33 +57,6 @@ void xyzsh_read_rc_core(char* path)
     xyzsh_restore_signal_default();
 }
 
-/*
-typedef struct {
-    char* mData;
-    int mData2;
-} sTestObj;
-
-int sTestObj_markfun(sObject* self)
-{
-    return 0;
-}
-
-void sTestObj_freefun(void* self)
-{
-    sTestObj* obj = self;
-    FREE(obj->mData);
-    FREE(obj);
-}
-
-sObject* sTestObj_new(char* data, int data2)
-{
-    sTestObj* obj = MALLOC(sizeof(sTestObj));
-    obj->mData = STRDUP(data);
-    obj->mData2 = data2;
-    return EXTOBJ_NEW_GC(obj, sTestObj_markfun, sTestObj_freefun, TRUE);
-}
-*/
-
 static void xyzsh_read_rc()
 {
     char sys_rc_path[PATH_MAX];
@@ -108,14 +81,11 @@ static void xyzsh_read_rc()
     xyzsh_read_rc_core(help_rc_path);
     xyzsh_read_rc_core(completion_rc_path);
     xyzsh_read_rc_core(user_rc_path);
-
-
-//    uobject_put(gRootObject, "test", sTestObj_new("AAA", 1));
 }
 
 void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 {
-    setenv("XYZSH_VERSION", "1.2.7", 1);
+    setenv("XYZSH_VERSION", "1.2.8", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     setlocale(LC_ALL, "");
@@ -125,10 +95,10 @@ void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 
     gErrMsg = STRING_NEW_STACK("");
 
-    gxyzshSigInt = FALSE;
-    gxyzshSigUser = FALSE;
-    gxyzshSigTstp = FALSE;
-    gxyzshSigCont = FALSE;
+    gXyzshSigInt = FALSE;
+    gXyzshSigUser = FALSE;
+    gXyzshSigTstp = FALSE;
+    gXyzshSigCont = FALSE;
 
     xyzsh_set_signal_other = NULL;
 
@@ -137,7 +107,7 @@ void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
     xyzsh_readline_init(FALSE);
 
     gDirStack = VECTOR_NEW_GC(10, FALSE);
-    uobject_put(gxyzshObject, "_dir_stack", gDirStack);
+    uobject_put(gXyzshObject, "_dir_stack", gDirStack);
 
     char* term_env = getenv("TERM");
     if(term_env != NULL && strcmp(term_env, "") != 0) {
@@ -199,7 +169,7 @@ void err_msg_adding(char* msg, char* sname, int line, char* command)
 
 void sig_int()
 {
-    gxyzshSigInt = TRUE; 
+    gXyzshSigInt = TRUE; 
 
 #ifdef MDEBUG
 fprintf(stderr, "SIGINT!!\n");
@@ -208,7 +178,7 @@ fprintf(stderr, "SIGINT!!\n");
 
 void sig_tstp()
 {
-    gxyzshSigInt = TRUE; 
+    gXyzshSigInt = TRUE; 
 #ifdef MDEBUG
 fprintf(stderr, "SIGTSTP!!\n");
 #endif
@@ -217,7 +187,7 @@ fprintf(stderr, "SIGTSTP!!\n");
 void sig_int_optc()
 {
     sigchld_block(1);
-    gxyzshSigInt = TRUE; 
+    gXyzshSigInt = TRUE; 
     //killpg(0, SIGINT);
 #ifdef MDEBUG
 //fprintf(stderr, "SIGINT!!\n");
@@ -245,7 +215,7 @@ void sig_cont_optc()
 
 void sig_user()
 {
-    gxyzshSigUser = TRUE;
+    gXyzshSigUser = TRUE;
 }
 
 void sigchld_action(int signum, siginfo_t* info, void* ctx)

--- a/src/xyzsh/block.h
+++ b/src/xyzsh/block.h
@@ -1,14 +1,6 @@
 #ifndef XYZSH_BLOCK_H
 #define XYZSH_BLOCK_H
 
-#ifdef MDEBUG
-sObject* block_new_debug_from_malloc(const char* fname, int line, const char* func_name);
-#define BLOCK_NEW_MALLOC() block_new_debug_from_malloc(__FILE__, __LINE__, __FUNCTION__)
-#else
-sObject* block_new_from_malloc();
-#define BLOCK_NEW_MALLOC() block_new_from_malloc()
-#endif
-
 sObject* block_new_from_gc(BOOL user_object);
 #define BLOCK_NEW_GC(o) block_new_from_gc(o)
 
@@ -17,19 +9,15 @@ sObject* block_new_from_stack();
 
 sObject* block_clone_gc(sObject* source, int type, BOOL user_object);
 sObject* block_clone_stack(sObject* source, int type);
-sObject* block_clone_malloc(sObject* source);
 int block_gc_children_mark(sObject* self);
 
 void block_delete_stack(sObject* self);
 void block_delete_gc(sObject* self);
-void block_delete_malloc(sObject* self);
 
 sCommand* sCommand_new(sStatment* statment);
 void sStatment_delete(sStatment* self);
-void sStatment_delete_malloc(sStatment* self);
 sStatment* sStatment_new(sObject* block, int sline, char* sname);
 void sCommand_delete(sCommand* self);
-void sCommand_delete_malloc(sCommand* self);
 
 void sCommand_add_arg_to_command(sCommand* self, MANAGED char* buf, int env, int glob);
 BOOL sCommand_add_message(sCommand* self, MANAGED char* message);

--- a/src/xyzsh/debug.h
+++ b/src/xyzsh/debug.h
@@ -6,6 +6,7 @@
 #define XYZSH_DEBUG_H
 
 #include <stdlib.h>
+#include <assert.h>
 
 #define P(F, O) { FILE* fp = fopen(F, "a"); fprintf(fp, O); fprintf(fp, "\n"); fclose(fp); }
 
@@ -19,6 +20,7 @@
 #   define FREE(o) free(o)
 #   define TIMER_BEGIN(msg)
 #   define TIMER_END()
+#   define ASSERT(o)
 
 #else 
 
@@ -42,6 +44,7 @@ void timer_count_end(const char* file, int line, const char* fun);
 
 #   define TIMER_BEGIN(msg) timer_count_start(msg)
 #   define TIMER_END() timer_count_end(__FILE__, __LINE__, __FUNCTION__)
+#    define ASSERT(o) assert(o)
 
 #endif
 

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -63,8 +63,25 @@ enum eCommandKind {
     kCommandMax
 };
 
-typedef void (*fFreeFun)(void*);
-typedef int (*fMarkFun)(void*);
+enum eLineField { kLF, kCRLF, kCR, kBel };
+extern enum eLineField gLineField;
+extern enum eKanjiCode gKanjiCode;
+
+enum eAppType { kATOptC, kATXApp, kATConsoleApp };
+    // Application kind
+
+extern enum eAppType gAppType;
+
+struct _sObject;
+
+extern struct _sObject* gErrMsg;               // error message
+
+extern struct _sObject* gStdin;
+extern struct _sObject* gStdout;
+extern struct _sObject* gStderr;
+
+void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script);
+void xyzsh_final();
 
 typedef struct _list_it {
    void* mItem;
@@ -88,10 +105,6 @@ typedef struct _hash_it {
    struct _hash_it* mNextIt;
 } hash_it;
 
-enum eLineField { kLF, kCRLF, kCR, kBel };
-extern enum eLineField gLineField;
-extern enum eKanjiCode gKanjiCode;
-
 typedef struct {
    hash_it** mTable;
    int mTableSize;
@@ -116,15 +129,6 @@ typedef struct {
    int mCount;
 } vector_obj;
 
-/*
-typedef struct {
-   void** mTable;
-   int mTableSize;
-   
-   int mCount;
-} stackframes_obj;
-*/
-
 #define kFDKindFD 1
 #define kFDKindBuf 2
 
@@ -166,6 +170,8 @@ struct sStatment;
 #define STATMENT_CONTEXTPIPE_NUMBER 0xFFFF
 
 #define STATMENT_COMMANDS_MAX 16
+#define XYZSH_OPTION_MAX 32
+#define XYZSH_MESSAGES_MAX 8
 
 struct block_obj;
 struct _sObject;
@@ -175,9 +181,6 @@ typedef struct _option_hash_it {
     char* mArg;
 } option_hash_it;
 
-#define XYZSH_OPTION_MAX 32
-#define XYZSH_MESSAGES_MAX 8
-
 enum eEnvKind { kEnv, kEnvBlock};
 
 typedef struct {
@@ -198,7 +201,6 @@ typedef struct {
 } sEnv;
 
 #define REDIRECT_KIND 0xff
-
 #define REDIRECT_IN 0x1
 #define REDIRECT_APPEND 0x2
 #define REDIRECT_OUT 0x4
@@ -274,12 +276,11 @@ struct block_obj
 struct _sObject;
 struct _sRunInfo;
 
-typedef struct                // a function object can be treated as block_obj
+typedef struct
 {
     struct _sObject* mBlock;
 
     struct _sObject* mParent;
-//    int mParentCount;
 
     struct _sObject* mLocalObjects;
     struct _sObject* mArgBlocks;
@@ -288,19 +289,7 @@ typedef struct                // a function object can be treated as block_obj
     struct _sRunInfo* mRunInfo;
 } fun_obj;
 
-typedef struct                // a function object can be treated as block_obj
-{
-    struct _sObject* mBlock;
-
-    struct _sObject* mParent;
-//    int mParentCount;
-
-    struct _sObject* mLocalObjects;
-    struct _sObject* mArgBlocks;
-
-    option_hash_it* mOptions;
-    struct _sRunInfo* mRunInfo;
-} class_obj;
+typedef fun_obj class_obj;
 
 typedef BOOL (*fXyzshNativeFun)(struct _sObject*, struct _sObject*, struct _sRunInfo*);
 
@@ -328,7 +317,7 @@ typedef struct _uobject_it {
    struct _uobject_it* mNextIt;
 } uobject_it;
 
-typedef struct {          // a user object can be treated like a hash_obj
+typedef struct {
    uobject_it** mTable;
    int mTableSize;
 
@@ -359,13 +348,18 @@ typedef struct {
    int mCounter;
 } memchecker_obj;
 
+struct _sRunInfo;
+
 typedef int (*fExtObjMarkFun)(struct _sObject* self);
 typedef void (*fExtObjFreeFun)(void* self);
+typedef BOOL (*fExtObjMainFun)(void* self, struct _sObject* nextin, struct _sObject* nextout, struct _sRunInfo* runinfo);
 
 typedef struct {
     void* mObject;
+
     fExtObjMarkFun mMarkFun;
     fExtObjFreeFun mFreeFun;
+    fExtObjMainFun mMainFun;
 } external_obj;
 
 typedef struct {
@@ -454,8 +448,15 @@ int stack_page_size();
 #include <xyzsh/block.h>
 #include <xyzsh/curses.h>
 
-sObject* extobj_new_from_gc(void* object, fExtObjMarkFun mark_fun, fExtObjFreeFun free_fun, BOOL user_object);
-#define EXTOBJ_NEW_GC(o, o2, o3, o4) extobj_new_from_gc(o, o2, o3, o4)
+sObject* extobj_new_from_gc(void* object, fExtObjMarkFun mark_fun, fExtObjFreeFun free_fun, fExtObjMainFun main_fun, BOOL user_object);
+#define EXTOBJ_NEW_GC(o, o2, o3, o4, o5) extobj_new_from_gc(o, o2, o3, o4, o5)
+
+#define UOBJECT_NEW_GC(o, o2, o3, o4) uobject_new_from_gc(o, o2, o3, o4)
+#define UOBJECT_NEW_STACK(o, o2, o3) uobject_new_from_stack(o, o2, o3)
+
+void uobject_delete_gc(sObject* self);
+void uobject_delete_stack(sObject* self);
+int uobject_gc_children_mark(sObject* self);
 
 sObject* uobject_new_from_gc(int size, sObject* parent, char* name, BOOL user_object);
 sObject* uobject_new_from_stack(int size, sObject* object, char* name);
@@ -465,26 +466,70 @@ void uobject_root_init(sObject* self);
 void uobject_put(sObject* self, char* key, void* item);
 void* uobject_item(sObject* self, char* key);
 void uobject_clear(sObject* self);
-
 uobject_it* uobject_loop_begin(sObject* self);
 void* uobject_loop_item(uobject_it* it);
 char* uobject_loop_key(uobject_it* it);
 uobject_it* uobject_loop_next(uobject_it* it);
 int uobject_count(sObject* self);
 
-#define UOBJECT_NEW_GC(o, o2, o3, o4) uobject_new_from_gc(o, o2, o3, o4)
-#define UOBJECT_NEW_STACK(o, o2, o3) uobject_new_from_stack(o, o2, o3)
-
-void uobject_delete_gc(sObject* self);
-void uobject_delete_stack(sObject* self);
-int uobject_gc_children_mark(sObject* self);
-
 sObject* external_prog_new_from_gc(char* path, BOOL user_object);
 void external_prog_delete_gc();
 
 #define EXTPROG_NEW_GC(o, o2) external_prog_new_from_gc(o, o2)
 
-/// structure used from run, which contains run time info
+sObject* memchecker_new_from_stack(int size);
+void memchecker_delete_stack(sObject* self);
+
+#define MEMCHECKER_NEW_STACK(o) memchecker_new_from_stack(o)
+
+void memchecker_put(sObject* self, void* key, int item);
+BOOL memchecker_erase(sObject* self, void* key);
+int memchecker_item(sObject* self, void* key);
+
+sObject* completion_new_from_gc(sObject* block, BOOL user_object);
+int completion_gc_children_mark(sObject* self);
+
+#define COMPLETION_NEW_GC(o, o2) completion_new_from_gc(o, o2)
+
+sObject* nfun_new_from_gc(fXyzshNativeFun fun, sObject* parent, BOOL user_object);
+#define NFUN_NEW_GC(o, o2, o3) nfun_new_from_gc(o, o2, o3)
+int nfun_gc_children_mark(sObject* self);
+void nfun_delete_gc(sObject* self);
+BOOL nfun_put_option_with_argument(sObject* self, MANAGED char* key);
+BOOL nfun_option_with_argument_item(sObject* self, char* key);
+
+sObject* fun_new_from_gc(sObject* parent, BOOL user_object);
+#define FUN_NEW_GC(o, o2) fun_new_from_gc(o, o2)
+void fun_delete_gc(sObject* self);
+int fun_gc_children_mark(sObject* self);
+#define FUN_NEW_STACK(o) fun_new_from_stack(o)
+sObject* fun_new_from_stack(sObject* parent);
+void fun_delete_stack(sObject* self);
+BOOL fun_put_option_with_argument(sObject* self, MANAGED char* key);
+BOOL fun_option_with_argument_item(sObject* self, char* key);
+
+sObject* class_new_from_gc(sObject* parent, BOOL user_object);
+#define CLASS_NEW_GC(o, o2) class_fun_new_from_gc(o, o2)
+void class_delete_gc(sObject* self);
+void class_delete_stack(sObject* self);
+BOOL class_option_with_argument_item(sObject* self, char* key);
+BOOL class_put_option_with_argument(sObject* self, MANAGED char* key);
+int class_gc_children_mark(sObject* self);
+
+sObject* fd_new_from_stack();
+void fd_delete_stack(sObject* self);
+#define FD_NEW_STACK(kind, fd) fd_new_from_stack(kind, fd)
+BOOL fd_write(sObject* self, char* str, int size);
+
+void fd_split(sObject* self, enum eLineField lf);
+BOOL fd_guess_lf(sObject* self, enum eLineField* lf);
+
+sObject* job_new_from_gc(char* name, pid_t pgroup, struct termios tty);
+#define JOB_NEW_GC(o, o2, o3) job_new_from_gc(o, o2, o3)
+void job_delete_gc(sObject* self);
+void job_push_back_child_pid(sObject* self, pid_t pid);
+
+/// structure used from run function, which contains run time info
 typedef struct _sRunInfo {
     char* mSName;
     int mSLine;
@@ -499,18 +544,13 @@ typedef struct _sRunInfo {
     sObject* mRecieverObject;
 } sRunInfo;
 
+BOOL xyzsh_rehash(char* sname, int sline);
+
 typedef BOOL (*fInternalCommand)(sObject*, sObject*, sRunInfo*);
 
 extern fInternalCommand kInternalCommands[kInnerCommand];
 extern char * gCommandKindStrs[kCommandMax];
 
-extern sObject* gObjectsInPipe;
-
-BOOL xyzsh_rehash(char* sname, int sline);
-
-#if defined(HAVE_MIGEMO_H)
-BOOL cmd_migemo_match(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
-#endif
 BOOL cmd_kanjicode(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_defined(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_funinfo(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
@@ -639,38 +679,14 @@ BOOL cmd_condition_re(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_sub(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_time(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 
-enum eAppType { kATOptC, kATXApp, kATConsoleApp };
-    // Application kind
-
-extern enum eAppType gAppType;
-
-void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script);
-void xyzsh_final();
-
-void run_init(enum eAppType app_type);
-void run_final();
+#if defined(HAVE_MIGEMO_H)
+BOOL cmd_migemo_match(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
+#endif
 
 BOOL run(sObject* block, sObject* pipein, sObject* pipeout, int* rcode, sObject* current_object, sObject* running_object);
-BOOL xyzsh(sObject* block, int* rcode);
-
-sObject* fd_new_from_stack();
-void fd_delete_stack(sObject* self);
-#define FD_NEW_STACK(kind, fd) fd_new_from_stack(kind, fd)
-BOOL fd_write(sObject* self, char* str, int size);
-
-sObject* job_new_from_gc(char* name, pid_t pgroup, struct termios tty);
-#define JOB_NEW_GC(o, o2, o3) job_new_from_gc(o, o2, o3)
-void job_delete_gc(sObject* self);
-void job_push_back_child_pid(sObject* self, pid_t pid);
-
-extern sObject* gErrMsg;               // error message
 
-extern sObject* gStdin;
-extern sObject* gStdout;
-extern sObject* gStderr;
-
-extern volatile BOOL gxyzshSigInt;
-extern volatile BOOL gxyzshSigUser;
+extern volatile BOOL gXyzshSigInt;
+extern volatile BOOL gXyzshSigUser;
 
 void xyzsh_restore_signal_default();
 void xyzsh_set_signal();
@@ -696,9 +712,6 @@ int gc_pool_size();
 int gc_used_objects_num();
 int gc_sweep();
 
-char* xstrncpy(char* src, char* des, int size);
-char* xstrncat(char* src, char* des, int size);
-
 BOOL parse(char* p, char* sname, int* sline, sObject* block, sObject** current_object);
 
 #define RCODE_BREAK 256
@@ -714,65 +727,19 @@ void xyzsh_kill_all_jobs();
 
 extern sObject* gRootObject;
 extern sObject* gCompletionObject;
-extern sObject* gxyzshObject;
+extern sObject* gXyzshObject;
 extern sObject* gCurrentObject;
-extern sObject* gObject;      // Object class object
 extern sObject* gStackFrames;
+extern sObject* gMemChecker;
+extern sObject* gGlobalPipe;
+extern sObject* gInheritObject;
 
 BOOL bufsiz_write(int fd, char* buf, int buf_len);
 
 BOOL load_file(char* fname, sObject* nextin, sObject* nextout, sRunInfo* runinfo, char** argv, int argc);
-BOOL xyzsh_load_file(char* fname, char** argv, int argc, sObject* current_object);
-void xyzsh_opt_c(char* cmd, char** argv, int argc);
-void xyzsh_readline_interface(char* cmdline, int cursor, char** argv, int argc);
-
-void fd_split(sObject* self, enum eLineField lf);
-BOOL fd_guess_lf(sObject* self, enum eLineField* lf);
-
-void err_msg(char* msg, char* sname, int line, char* command);
-void err_msg_adding(char* msg, char* sname, int line, char* command);
-
-sObject* memchecker_new_from_stack(int size);
-void memchecker_delete_stack(sObject* self);
-
-#define MEMCHECKER_NEW_STACK(o) memchecker_new_from_stack(o)
-
-void memchecker_put(sObject* self, void* key, int item);
-BOOL memchecker_erase(sObject* self, void* key);
-int memchecker_item(sObject* self, void* key);
 
 int object_gc_children_mark(sObject* self);
 
-sObject* completion_new_from_gc(sObject* block, BOOL user_object);
-int completion_gc_children_mark(sObject* self);
-
-#define COMPLETION_NEW_GC(o, o2) completion_new_from_gc(o, o2)
-
-sObject* nfun_new_from_gc(fXyzshNativeFun fun, sObject* parent, BOOL user_object);
-#define NFUN_NEW_GC(o, o2, o3) nfun_new_from_gc(o, o2, o3)
-int nfun_gc_children_mark(sObject* self);
-void nfun_delete_gc(sObject* self);
-BOOL nfun_put_option_with_argument(sObject* self, MANAGED char* key);
-BOOL nfun_option_with_argument_item(sObject* self, char* key);
-
-sObject* fun_new_from_gc(sObject* parent, BOOL user_object);
-#define FUN_NEW_GC(o, o2) fun_new_from_gc(o, o2)
-void fun_delete_gc(sObject* self);
-int fun_gc_children_mark(sObject* self);
-#define FUN_NEW_STACK(o) fun_new_from_stack(o)
-sObject* fun_new_from_stack(sObject* parent);
-void fun_delete_stack(sObject* self);
-BOOL fun_put_option_with_argument(sObject* self, MANAGED char* key);
-BOOL fun_option_with_argument_item(sObject* self, char* key);
-
-sObject* class_new_from_gc(sObject* parent, BOOL user_object);
-#define CLASS_NEW_GC(o, o2) class_fun_new_from_gc(o, o2)
-void class_delete_gc(sObject* self);
-void class_delete_stack(sObject* self);
-BOOL class_option_with_argument_item(sObject* self, char* key);
-BOOL class_put_option_with_argument(sObject* self, MANAGED char* key);
-int class_gc_children_mark(sObject* self);
-
 BOOL sCommand_option_item(sCommand* self, char* key);
 char* sCommand_option_with_argument_item(sCommand* self, char* key);
 BOOL sCommand_put_option(sCommand* self, MANAGED char* key);
@@ -782,56 +749,58 @@ BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo*
 void sCommand_sweep_runtime_info(sCommand* command);
 void sStatment_sweep_runtime_info(sStatment* self);
 
-extern sObject* gMemChecker;
-
-extern FILE* gTest;
-
-extern sObject* gInherit;
-
-#define XYZSH_INHERIT_MAX 32
-
-sObject* access_object(char* name, sObject** current, sObject* running_object);
-sObject* access_object2(char* name, sObject* current, sObject* running_object);
-sObject* access_object3(char* name, sObject** current);
-
 BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* runinfo, char** argv, int argc, sObject** blocks, int blocks_num);
 
-extern sObject* gDirStack;
-
 #define PARSER_MAGIC_NUMBER_ENV 3
 #define PARSER_MAGIC_NUMBER_OPTION 5
 
 #include <oniguruma.h>
 int get_onig_regex(regex_t** reg, sCommand* command, char* regex);
 
-extern sObject* gPrompt;
-
-extern sObject* gGlobalPipe;
-
 int readline_signal();
 void clear_matching_info_variable();
-
-BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_point, char* source_name, char** argv, int argc, fXyzshJobDone xyzsh_job_done_);
-char* xyzsh_job_title(int n);
-int xyzsh_job_num();
-BOOL xyzsh_run(int* rcode, sObject* block, char* source_name, fXyzshJobDone xyzsh_job_done_, sObject* nextin, sObject* nextout, int argc, char** argv, sObject* current_object);
-
 #include <stdarg.h>
-
-void xyzsh_add_inner_command(sObject* object, char* name, fXyzshNativeFun command, int arg_num, ...);
-
-void readline_write_history();
-void readline_read_history();
 void xyzsh_read_rc_core(char* path);
 
-extern sObject* gStackFrames;
+#define XYZSH_OBJECTS_IN_PIPE_MAX 128
+
+void run_init(enum eAppType app_type);
+void run_final();
 
 #if defined(HAVE_MIGEMO_H)
 void migemo_init();
 void migemo_final();
 #endif
 
-#define XYZSH_OBJECTS_IN_PIPE_MAX 128
+extern sObject* gPrompt;
+extern sObject* gDirStack;
+
+void readline_write_history();
+void readline_read_history();
+
+char* xstrncpy(char* src, char* des, int size);
+char* xstrncat(char* src, char* des, int size);
+
+//////////////////////////////////////////////////////////////////////
+// xyzsh API
+//////////////////////////////////////////////////////////////////////
+BOOL xyzsh_load_file(char* fname, char** argv, int argc, sObject* current_object);
+void xyzsh_opt_c(char* cmd, char** argv, int argc);
+void xyzsh_readline_interface(char* cmdline, int cursor, char** argv, int argc);
+
+void xyzsh_add_inner_command(sObject* object, char* name, fXyzshNativeFun command, int arg_num, ...);
+
+BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_point, char* source_name, char** argv, int argc, fXyzshJobDone xyzsh_job_done_);
+char* xyzsh_job_title(int n);
+int xyzsh_job_num();
+BOOL xyzsh_run(int* rcode, sObject* block, char* source_name, fXyzshJobDone xyzsh_job_done_, sObject* nextin, sObject* nextout, int argc, char** argv, sObject* current_object);
+
+void err_msg(char* msg, char* sname, int line, char* command);
+void err_msg_adding(char* msg, char* sname, int line, char* command);
+
+sObject* access_object(char* name, sObject** current, sObject* running_object);
+sObject* access_object2(char* name, sObject* current, sObject* running_object);
+sObject* access_object3(char* name, sObject** current);
 
 #endif