Commit: 5503b30d3381b9831ffbc9792e9591e23444e5ea - xyzsh (git)

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

Commit MetaInfo

• Révision: 5503b30d3381b9831ffbc9792e9591e23444e5ea (tree)
• l'heure: 2012-10-26 18:06:01
• Auteur: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Message de Log

v1.1.1 relese

Change Summary

• modified: CHANGELOG
• modified: LICENSE
• modified: TODO
• modified: completion.xyzsh
• modified: configure
• modified: configure.in
• modified: help.xyzsh
• modified: src/block.c
• modified: src/cmd_base.c
• modified: src/cmd_condition.c
• modified: src/cmd_obj.c
• modified: src/cmd_str.c
• modified: src/gc.c
• modified: src/hash.c
• modified: src/interface.c
• modified: src/object.c
• modified: src/parser.c
• modified: src/readline.c
• modified: src/run.c
• add: src/uobject.c
• modified: src/xyzsh.c
• modified: src/xyzsh/xyzsh.h
• modified: xyzsh.xyzsh

Modification

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,12 @@
 
+2012 18th Octorber version 1.1.1
+
+    add "defined" inner command. see help
+
+    add "kanjicode" inner command. see help
+
+    fixed help bug
+
 2012 18th Octorber version 1.1.0
 
     fixed break in while loop bug

--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Yamanaka Gorou
+Copyright (c) 2012 ab25cq
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
 +++ 入れたい機能 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+run_functionなど_stackframeのところがおかしい
+
 リファレンスの引数
 
 オブジェクトの絶対パス
@@ -16,6 +18,8 @@ glob 内部コマンド
 
 $$() $でオプションの内容が入っていたら、オプションとして使う
 
+エラーメッセージが分かりにくい
+
 +++ 機能のバグ +++++++++++++++++++++++++++++++++++++++++++++++++++++
 エラー出力のリダイレクト
 

--- a/completion.xyzsh
+++ b/completion.xyzsh
@@ -44,6 +44,10 @@ completion sweep (
     hash COMPLETION_OPTIONS -key sweep
 )
 
+completion defined (
+    self | egrep -v external\ program\$ | egrep -v native\ function\$ | egrep -v '^root:|^self:|^parent:|^run:'| root::scan '(^.+?):' 
+)
+
 completion var (
     self | egrep ': var$' | root::scan '(^.+?):' 
     hash COMPLETION_OPTIONS -key var

--- a/configure
+++ b/configure
@@ -3042,7 +3042,7 @@ fi
 #####################################################################
 # check operating systems
 #####################################################################
-SO_VERSION=1.4.5
+SO_VERSION=1.5.0
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Operating System" >&5
 $as_echo_n "checking Operating System... " >&6; }
@@ -3205,7 +3205,7 @@ CFLAGS="-DSYSCONFDIR=\"\\\"$sysconfdir/xyzsh/\\\"\" -DDATAROOTDIR=\"\\\"$dataroo
 
 
 
-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/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"
 
 #####################################################################
 # ncurses settings

--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ CFLAGS="-DSYSCONFDIR=\"\\\"$sysconfdir/xyzsh/\\\"\" -DDATAROOTDIR=\"\\\"$dataroo
 
 AC_SUBST(CFLAGS)
 
-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/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"
 
 #####################################################################
 # ncurses settings

--- a/help.xyzsh
+++ b/help.xyzsh
@@ -2,16 +2,16 @@ class Help (
     def set_helps_ja (
         | chomp | split -multi-line -La \n-\n | each -La -number 2 ( 
             | lines -La 0 (
-                | chomp | split | lines 0 (|print) | var -local cmd_name
-                | chomp | var -local cmdline
+                | chomp | split | lines 0 (|print) | var -local CMD_NAME
+                | chomp | var -local CMDLINE
             ) 1 (
-                | chomp | ary -local explain
+                | chomp | ary -local EXPLAIN
             )
 
-            var cmd_name | chomp
+            var CMD_NAME | chomp
             print \a
-            var cmdline | add \n
-            ary explain | chomp
+            var CMDLINE | add \n
+            ary EXPLAIN | chomp
             print \a
         ) | hash -La HELPS.ja
     )
@@ -19,16 +19,16 @@ class Help (
     def set_helps (
         | chomp | split -multi-line -La \n-\n | each -La -number 2 ( 
             | lines -La 0 (
-                | chomp | split | lines 0 (|print) | var -local cmd_name
-                | chomp | var -local cmdline
+                | chomp | split | lines 0 (|print) | var -local CMD_NAME
+                | chomp | var -local CMDLINE
             ) 1 (
-                | chomp | ary -local explain
+                | chomp | ary -local EXPLAIN
             )
 
-            var cmd_name | chomp
+            var CMD_NAME | chomp
             print \a
-            var cmdline | add \n
-            ary explain | chomp
+            var CMDLINE | add \n
+            ary EXPLAIN | chomp
             print \a
         ) | hash -La HELPS
     )
@@ -71,6 +71,19 @@ class Help (
 object help ( Help )
 
 print <<<'EOS'
+defined オブジェクト
+-
+オブジェクトが定義されていたら真を返す
+-
+kanjicode
+-
+現在の漢字コードを表示する。
+
+-byte バイトに設定する
+-sjis sjisに設定する
+-eucjp eucjpに設定する
+-utf8 utf8に設定する
+-
 funinfo
 -
 実行中の関数もしくはクラスの情報を得る
@@ -913,6 +926,19 @@ EOS | help::set_helps_ja
 ### English Help ##################################################
 
 print <<<'EOS'
+defined (object name)
+-
+if object is defined, return true
+-
+kanjicode
+-
+show language setting
+
+-byte change language setting to byte
+-sjis change language setting to SJIS(for Japanese)
+-eucjp change language setting to EUCJP(for Japanese)
+-utf8 change language setting to UTF8
+-
 funinfo
 -
 output running function or class information.

--- a/src/block.c
+++ b/src/block.c
@@ -270,8 +270,8 @@ static void sCommand_copy_deeply(sCommand* dest, sCommand* src)
     }
     dest->mArgsRuntime[i] = NULL;
 */
-    dest->mArgsRuntime = MALLOC(sizeof(char*)*8);
-    dest->mArgsSizeRuntime = 8;
+    dest->mArgsRuntime = MALLOC(sizeof(char*)*3);
+    dest->mArgsSizeRuntime = 3;
     dest->mArgsNumRuntime = 0;
 
     dest->mBlocks = MALLOC(sizeof(sObject*)*src->mBlocksSize);
@@ -308,6 +308,8 @@ static void sCommand_copy_deeply(sCommand* dest, sCommand* src)
         }
         dest->mMessagesNum = src->mMessagesNum;
     }
+
+    dest->mRedirectsFileNamesRuntime = NULL;
 }
 
 static void sCommand_copy_deeply_stack(sCommand* dest, sCommand* src)
@@ -355,8 +357,8 @@ static void sCommand_copy_deeply_stack(sCommand* dest, sCommand* src)
     }
     dest->mArgsRuntime[i] = NULL;
 */
-    dest->mArgsRuntime = MALLOC(sizeof(char*)*8);
-    dest->mArgsSizeRuntime = 8;
+    dest->mArgsRuntime = MALLOC(sizeof(char*)*3);
+    dest->mArgsSizeRuntime = 3;
     dest->mArgsNumRuntime = 0;
 
     dest->mBlocks = MALLOC(sizeof(sObject*)*src->mBlocksSize);
@@ -394,6 +396,8 @@ static void sCommand_copy_deeply_stack(sCommand* dest, sCommand* src)
         }
         dest->mMessagesNum = src->mMessagesNum;
     }
+
+    dest->mRedirectsFileNamesRuntime = NULL;
 }
 
 static void sCommand_copy_deeply_malloc(sCommand* dest, sCommand* src)
@@ -441,8 +445,8 @@ static void sCommand_copy_deeply_malloc(sCommand* dest, sCommand* src)
     }
     dest->mArgsRuntime[i] = NULL;
 */
-    dest->mArgsRuntime = MALLOC(sizeof(char*)*8);
-    dest->mArgsSizeRuntime = 8;
+    dest->mArgsRuntime = MALLOC(sizeof(char*)*3);
+    dest->mArgsSizeRuntime = 3;
     dest->mArgsNumRuntime = 0;
 
     dest->mBlocks = MALLOC(sizeof(sObject*)*src->mBlocksSize);
@@ -480,6 +484,8 @@ static void sCommand_copy_deeply_malloc(sCommand* dest, sCommand* src)
         }
         dest->mMessagesNum = src->mMessagesNum;
     }
+
+    dest->mRedirectsFileNamesRuntime = NULL;
 }
 
 void sCommand_delete(sCommand* self)
@@ -513,10 +519,13 @@ void sCommand_delete(sCommand* self)
 
     if(self->mBlocks) FREE(self->mBlocks);
 
-    for(i=0; i<self->mRedirectsNum; i++) {
-        FREE(self->mRedirectsFileNames[i]);
+    if(self->mRedirectsFileNames) {
+        for(i=0; i<self->mRedirectsNum; i++) {
+            FREE(self->mRedirectsFileNames[i]);
+        }
+        FREE(self->mRedirectsFileNames);
     }
-    if(self->mRedirectsFileNames) FREE(self->mRedirectsFileNames);
+
     if(self->mRedirects) FREE(self->mRedirects);
 
     if(self->mRedirectsFileNamesRuntime) {
@@ -564,10 +573,12 @@ void sCommand_delete_malloc(sCommand* self)
     }
     if(self->mBlocks) FREE(self->mBlocks);
 
-    for(i=0; i<self->mRedirectsNum; i++) {
-        FREE(self->mRedirectsFileNames[i]);
+    if(self->mRedirectsFileNames) {
+        for(i=0; i<self->mRedirectsNum; i++) {
+            FREE(self->mRedirectsFileNames[i]);
+        }
+        FREE(self->mRedirectsFileNames);
     }
-    if(self->mRedirectsFileNames) FREE(self->mRedirectsFileNames);
     if(self->mRedirects) FREE(self->mRedirects);
 
     if(self->mRedirectsFileNamesRuntime) {
@@ -672,7 +683,12 @@ static void sStatment_copy_deeply(sStatment* dest, sStatment* source)
         sCommand_copy_deeply(dest->mCommands + i, source->mCommands + i);
     }
 
-    dest->mFName = STRDUP(source->mFName);
+    if(source->mFName) {
+        dest->mFName = STRDUP(source->mFName);
+    }
+    else {
+        dest->mFName = NULL;
+    }
     dest->mLine = source->mLine;
 
     dest->mFlags = source->mFlags;
@@ -687,7 +703,12 @@ static void sStatment_copy_deeply_stack(sStatment* dest, sStatment* source)
         sCommand_copy_deeply_stack(dest->mCommands + i, source->mCommands + i);
     }
 
-    dest->mFName = STRDUP(source->mFName);
+    if(source->mFName) {
+        dest->mFName = STRDUP(source->mFName);
+    }
+    else {
+        dest->mFName = NULL;
+    }
     dest->mLine = source->mLine;
 
     dest->mFlags = source->mFlags;
@@ -702,7 +723,12 @@ static void sStatment_copy_deeply_malloc(sStatment* dest, sStatment* source)
         sCommand_copy_deeply_malloc(dest->mCommands + i, source->mCommands + i);
     }
 
-    dest->mFName = STRDUP(source->mFName);
+    if(source->mFName) {
+        dest->mFName = STRDUP(source->mFName);
+    }
+    else {
+        dest->mFName = NULL;
+    }
     dest->mLine = source->mLine;
 
     dest->mFlags = source->mFlags;

--- a/src/cmd_base.c
+++ b/src/cmd_base.c
@@ -255,10 +255,10 @@ BOOL cmd_stackframe(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
     char buf[BUFSIZ];
 
-    hash_it* it = hash_loop_begin(SFUN(runinfo->mRunningObject).mLocalObjects);
+    uobject_it* it = uobject_loop_begin(SFUN(runinfo->mRunningObject).mLocalObjects);
     while(it) {
-        sObject* object2 = hash_loop_item(it);
-        char* key = hash_loop_key(it);
+        sObject* object2 = uobject_loop_item(it);
+        char* key = uobject_loop_key(it);
 
         char*obj_kind[16] = {
             NULL, "var", "array", "hash", "list", "native function", "block", "file dicriptor", "job", "object", "memchecker", "function", "class", "external program", "completion", "external object"
@@ -271,10 +271,10 @@ BOOL cmd_stackframe(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             return FALSE;
         }
 
-        it = hash_loop_next(it);
+        it = uobject_loop_next(it);
     }
 
-    if(hash_count(SFUN(runinfo->mRunningObject).mLocalObjects) == 0) {
+    if(uobject_count(SFUN(runinfo->mRunningObject).mLocalObjects) == 0) {
         runinfo->mRCode = 1;
     }
     else {
@@ -395,7 +395,7 @@ BOOL cmd_sweep(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             char* var_name = command->mArgsRuntime[i];
             sObject* current_object = runinfo->mCurrentObject;
 
-            sObject* item = hash_item(current_object, var_name);
+            sObject* item = uobject_item(current_object, var_name);
 
             if(item && item->mUserObject) {
                 if(item != gCurrentObject || strcmp(var_name, SUOBJECT(item).mName) != 0) {
@@ -673,9 +673,9 @@ static BOOL xyzsh_seek_external_programs(char* path, sObject* sys, char* sname,
                 && strcmp(entry->d_name, "..") != 0
                 &&
                 (stat_.st_mode & S_IXUSR ||stat_.st_mode & S_IXGRP||stat_.st_mode & S_IXOTH)
-                && hash_item(sys, entry->d_name) == NULL)
+                && uobject_item(sys, entry->d_name) == NULL)
             {
-                hash_put(sys, entry->d_name, EXTPROG_NEW_GC(path2, TRUE));
+                uobject_put(sys, entry->d_name, EXTPROG_NEW_GC(path2, TRUE));
             }
         }
 
@@ -700,7 +700,7 @@ BOOL xyzsh_rehash(char* sname, int sline)
     }
 
     sObject* sys = UOBJECT_NEW_GC(8, gRootObject, "sys", FALSE);
-    hash_put(gRootObject, "sys", sys);
+    uobject_put(gRootObject, "sys", sys);
     uobject_init(sys);
 
     char buf[PATH_MAX+1];
@@ -798,7 +798,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);
-        hash_put(gxyzshObject, "_prompt", gPrompt);
+        uobject_put(gxyzshObject, "_prompt", gPrompt);
         runinfo->mRCode = 0;
     }
 
@@ -870,3 +870,85 @@ BOOL cmd_block(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
     return TRUE;
 }
+
+BOOL cmd_kanjicode(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
+{
+    sCommand* command = runinfo->mCommand;
+
+    if(sCommand_option_item(command, "-byte")) {
+        gKanjiCode = kByte;
+        runinfo->mRCode = 0;
+    }
+    else if(sCommand_option_item(command, "-utf8")) {
+        gKanjiCode = kUtf8;
+        runinfo->mRCode = 0;
+    }
+    else if(sCommand_option_item(command, "-sjis")) {
+        gKanjiCode = kSjis;
+        runinfo->mRCode = 0;
+    }
+    else if(sCommand_option_item(command, "-eucjp")) {
+        gKanjiCode = kEucjp;
+        runinfo->mRCode = 0;
+    }
+    else {
+        if(gKanjiCode == kUtf8) {
+            if(!fd_write(nextout, "utf8", 4)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+            if(!fd_write(nextout, "\n", 1)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+
+            runinfo->mRCode = 0;
+        }
+        else if(gKanjiCode == kByte) {
+            if(!fd_write(nextout, "byte", 4)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+            if(!fd_write(nextout, "\n", 1)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+
+            runinfo->mRCode = 0;
+        }
+        else if(gKanjiCode == kSjis) {
+            if(!fd_write(nextout, "sjis", 4)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+            if(!fd_write(nextout, "\n", 1)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+
+            runinfo->mRCode = 0;
+        }
+        else if(gKanjiCode == kEucjp) {
+            if(!fd_write(nextout, "eucjp", 5)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+            if(!fd_write(nextout, "\n", 1)) {
+                err_msg("interrupt", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                return FALSE;
+            }
+
+            runinfo->mRCode = 0;
+        }
+    }
+
+    return TRUE;
+}

--- a/src/cmd_condition.c
+++ b/src/cmd_condition.c
@@ -624,25 +624,25 @@ void clear_matching_info_variable()
 {
     char buf[128];
     snprintf(buf, 128, "");
-    hash_put(gRootObject, "MATCH", STRING_NEW_GC(buf, FALSE));
+    uobject_put(gRootObject, "MATCH", STRING_NEW_GC(buf, FALSE));
 
     snprintf(buf, 128, "");
-    hash_put(gRootObject, "PREMATCH", STRING_NEW_GC(buf, FALSE));
+    uobject_put(gRootObject, "PREMATCH", STRING_NEW_GC(buf, FALSE));
 
     snprintf(buf, 128, "");
-    hash_put(gRootObject, "POSTMATCH", STRING_NEW_GC(buf, FALSE));
+    uobject_put(gRootObject, "POSTMATCH", STRING_NEW_GC(buf, FALSE));
 
     snprintf(buf, 128, "");
-    hash_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
+    uobject_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
 
     snprintf(buf, 128, "");
-    hash_put(gRootObject, "LAST_MATCH", STRING_NEW_GC(buf, FALSE));
+    uobject_put(gRootObject, "LAST_MATCH", STRING_NEW_GC(buf, FALSE));
 
     int i;
     for(i=0; i<10; i++) {
         char name[128];
         snprintf(name, 128, "%d", i);
-        hash_put(gRootObject, name, STRING_NEW_GC(buf, FALSE));
+        uobject_put(gRootObject, name, STRING_NEW_GC(buf, FALSE));
     }
 }
 
@@ -690,17 +690,17 @@ BOOL cmd_condition_re(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
             if(r2 >= 0) {
                 if(region->beg[0] > 0) {
-                    hash_put(gRootObject, "PREMATCH", STRING_NEW_GC3(target, region->beg[0], FALSE));
+                    uobject_put(gRootObject, "PREMATCH", STRING_NEW_GC3(target, region->beg[0], FALSE));
                 }
 
                 const int size = region->end[0] - region->beg[0];
 
-                hash_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size, FALSE));
-                hash_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size, FALSE));
+                uobject_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size, FALSE));
+                uobject_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size, FALSE));
 
                 const int n = strlen(target)-region->end[0];
                 if(n > 0) {
-                    hash_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
+                    uobject_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
                 }
 
                 int i;
@@ -710,7 +710,7 @@ BOOL cmd_condition_re(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                     char name[16];
                     snprintf(name, 16, "%d", i);
 
-                    hash_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
+                    uobject_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
                 }
 
                 if(region->num_regs > 0) {
@@ -718,12 +718,12 @@ BOOL cmd_condition_re(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
                     const int size = region->end[n] - region->beg[n];
 
-                    hash_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
+                    uobject_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
                 }
 
                 char buf[128];
                 snprintf(buf, 128, "%d", region->num_regs);
-                hash_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
+                uobject_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
 
                 if(verbose) {
                     int point = str_pointer2kanjipos(code, target, target + r2);

--- a/src/cmd_obj.c
+++ b/src/cmd_obj.c
@@ -29,10 +29,10 @@ BOOL cmd_mshow(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
 
     sObject* object = runinfo->mRecieverObject;
-    hash_it* it = hash_loop_begin(object);
+    uobject_it* it = uobject_loop_begin(object);
     while(it) {
-        sObject* object2 = hash_loop_item(it);
-        char* key = hash_loop_key(it);
+        sObject* object2 = uobject_loop_item(it);
+        char* key = uobject_loop_key(it);
 
         char buf[BUFSIZ];
         char*obj_kind[16] = {
@@ -46,7 +46,7 @@ BOOL cmd_mshow(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             return FALSE;
         }
 
-        it = hash_loop_next(it);
+        it = uobject_loop_next(it);
     }
 
     runinfo->mRCode = 0;
@@ -64,7 +64,7 @@ static BOOL entry_fun(sObject* nextin, sObject* nextout, sRunInfo* runinfo, sObj
         block = fun_clone_from_stack_block_gc(block, TRUE, NULL); // block is a stack object, so change the memory manager from stack to gc
 
     if(sCommand_option_item(command, "-inherit")) {
-        sObject* parent = hash_item(object, command->mArgsRuntime[1]);
+        sObject* parent = uobject_item(object, command->mArgsRuntime[1]);
         if(parent) {
             if(type == T_FUN && (TYPE(parent) == T_FUN || TYPE(parent) == T_NFUN) 
                 || type == T_CLASS && TYPE(parent) == T_CLASS) 
@@ -127,7 +127,7 @@ static BOOL entry_fun(sObject* nextin, sObject* nextout, sRunInfo* runinfo, sObj
         }
     }
 
-    hash_put(object, command->mArgsRuntime[1], block);
+    uobject_put(object, command->mArgsRuntime[1], block);
 
     return TRUE;
 }
@@ -268,6 +268,30 @@ BOOL cmd_class(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     return TRUE;
 }
 
+BOOL cmd_defined(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
+{
+    sCommand* command = runinfo->mCommand;
+
+    if(command->mArgsNumRuntime > 1) {
+        sObject* object = runinfo->mCurrentObject;
+        int i;
+        for(i=1; i<command->mArgsNumRuntime; i++) {
+            sObject* reciever = runinfo->mCurrentObject;
+            sObject* obj = access_object(command->mArgsRuntime[i], &reciever, runinfo->mRunningObject);
+
+            if(obj) {
+                runinfo->mRCode = 0;
+            }
+            else {
+                runinfo->mRCode = RCODE_NFUN_FALSE;
+                break;
+            }
+        }
+    }
+
+    return TRUE;
+}
+
 BOOL cmd_inherit(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 {
     sCommand* command = runinfo->mCommand;
@@ -474,10 +498,10 @@ BOOL cmd_var(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 if(i-1 < max) {
                     sObject* new_var = STRING_NEW_GC(vector_item(SFD(nextin).fdbuf.mLines, i-1), TRUE);
                     string_chomp(new_var);
-                    hash_put(object, command->mArgsRuntime[i], new_var);
+                    uobject_put(object, command->mArgsRuntime[i], new_var);
                 }
                 else {
-                    hash_put(object, command->mArgsRuntime[i], STRING_NEW_GC("", TRUE));
+                    uobject_put(object, command->mArgsRuntime[i], STRING_NEW_GC("", TRUE));
                 }
             }
 
@@ -514,7 +538,7 @@ BOOL cmd_object(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             int i;
             for(i=1; i<command->mArgsNumRuntime; i++) {
                 sObject* new_object = UOBJECT_NEW_GC(8, object, command->mArgsRuntime[i], TRUE);
-                hash_put(object, command->mArgsRuntime[i], new_object);
+                uobject_put(object, command->mArgsRuntime[i], new_object);
                 uobject_init(new_object);
 
                 int rcode = 0;
@@ -531,7 +555,7 @@ BOOL cmd_object(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             int i;
             for(i=1; i<command->mArgsNumRuntime; i++) {
                 sObject* new_object = UOBJECT_NEW_GC(8, object, command->mArgsRuntime[i], TRUE);
-                hash_put(object, command->mArgsRuntime[i], new_object);
+                uobject_put(object, command->mArgsRuntime[i], new_object);
                 uobject_init(new_object);
                 runinfo->mRCode = 0;
             }
@@ -618,7 +642,7 @@ BOOL cmd_co(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
 
     if(command->mArgsNumRuntime == 2) {
-        sObject* new_current = hash_item(gCurrentObject, command->mArgsRuntime[1]);
+        sObject* new_current = uobject_item(gCurrentObject, command->mArgsRuntime[1]);
         if(new_current && TYPE(new_current) == T_UOBJECT) {
             gCurrentObject = new_current;
             runinfo->mRCode = 0;
@@ -741,7 +765,7 @@ BOOL cmd_ref(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                         int type = memchecker_item(gMemChecker, mem);
 
                         if(type >= 0) {
-                            hash_put(object, command->mArgsRuntime[i+1], mem);
+                            uobject_put(object, command->mArgsRuntime[i+1], mem);
                         }
                         else {
                             err_msg("invalid adress. it's not memory managed by a xyzsh gabage collecter", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
@@ -964,7 +988,7 @@ BOOL cmd_ary(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 return FALSE;
             }
 
-            hash_put(object, command->mArgsRuntime[1], new_ary);
+            uobject_put(object, command->mArgsRuntime[1], new_ary);
             for(i=0; i<max; i++) {
                 sObject* new_var = STRING_NEW_GC(vector_item(SFD(nextin).fdbuf.mLines, i), FALSE);
                 string_chomp(new_var);
@@ -1172,7 +1196,7 @@ BOOL cmd_hash(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 return FALSE;
             }
 
-            hash_put(object, command->mArgsRuntime[1], new_hash);
+            uobject_put(object, command->mArgsRuntime[1], new_hash);
             sObject* key = STRING_NEW_STACK("");
             for(i=0; i<max; i++) {
                 if((i % 2) == 0) {

--- a/src/cmd_str.c
+++ b/src/cmd_str.c
@@ -1177,17 +1177,17 @@ BOOL cmd_sub(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
                         const int size = region->beg[0] - (p - target);
                         if(size > 0) {
-                            hash_put(gRootObject, "PREMATCH", STRING_NEW_GC3(p, size, FALSE));
+                            uobject_put(gRootObject, "PREMATCH", STRING_NEW_GC3(p, size, FALSE));
                         }
 
                         const int size2 = region->end[0] - region->beg[0];
 
-                        hash_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
-                        hash_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
+                        uobject_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
+                        uobject_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
 
                         const int n = strlen(target)-region->end[0];
                         if(n > 0) {
-                            hash_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
+                            uobject_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
                         }
 
                         int i;
@@ -1197,7 +1197,7 @@ BOOL cmd_sub(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                             char name[16];
                             snprintf(name, 16, "%d", i);
 
-                            hash_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
+                            uobject_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
                         }
 
                         if(region->num_regs > 0) {
@@ -1205,12 +1205,12 @@ BOOL cmd_sub(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
                             const int size = region->end[n] - region->beg[n];
 
-                            hash_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
+                            uobject_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
                         }
 
                         char buf[128];
                         snprintf(buf, 128, "%d", region->num_regs);
-                        hash_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
+                        uobject_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
 
                         fd_clear(nextin2);
                         fd_clear(nextout2);
@@ -1358,7 +1358,7 @@ BOOL cmd_sub(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
         char buf[128];
         snprintf(buf, 128, "%d", sub_count);
-        hash_put(gRootObject, "SUB_COUNT", STRING_NEW_GC(buf, FALSE));
+        uobject_put(gRootObject, "SUB_COUNT", STRING_NEW_GC(buf, FALSE));
 
         if(sub_count > 0) {
             if(SFD(nextin).fdbuf.mBufLen == 0) {
@@ -1488,17 +1488,17 @@ BOOL cmd_scan(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
                         const int size = region->beg[0] - (p - target);
                         if(size > 0) {
-                            hash_put(gRootObject, "PREMATCH", STRING_NEW_GC3(p, size, FALSE));
+                            uobject_put(gRootObject, "PREMATCH", STRING_NEW_GC3(p, size, FALSE));
                         }
 
                         const int size2 = region->end[0] - region->beg[0];
 
-                        hash_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
-                        hash_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
+                        uobject_put(gRootObject, "MATCH", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
+                        uobject_put(gRootObject, "0", STRING_NEW_GC3(target + region->beg[0], size2, FALSE));
 
                         const int n = strlen(target)-region->end[0];
                         if(n > 0) {
-                            hash_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
+                            uobject_put(gRootObject, "POSTMATCH", STRING_NEW_GC3(target + region->end[0], n, FALSE));
                         }
 
                         int i;
@@ -1508,7 +1508,7 @@ BOOL cmd_scan(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                             char name[16];
                             snprintf(name, 16, "%d", i);
 
-                            hash_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
+                            uobject_put(gRootObject, name, STRING_NEW_GC3(target + region->beg[i], size, FALSE));
                         }
 
                         if(region->num_regs > 0) {
@@ -1516,12 +1516,12 @@ BOOL cmd_scan(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
                             const int size = region->end[n] - region->beg[n];
 
-                            hash_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
+                            uobject_put(gRootObject, "LAST_MATCH", STRING_NEW_GC3(target + region->beg[n], size, FALSE));
                         }
 
                         char buf[128];
                         snprintf(buf, 128, "%d", region->num_regs);
-                        hash_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
+                        uobject_put(gRootObject, "MATCH_NUMBER", STRING_NEW_GC(buf, FALSE));
 
                         int rcode = 0;
                         if(!run(block, nextin2, nextout, &rcode, runinfo->mCurrentObject, runinfo->mRunningObject)) {
@@ -1600,7 +1600,7 @@ BOOL cmd_scan(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
             char buf[128];
             snprintf(buf, 128, "%d", match_count);
-            hash_put(gRootObject, "MATCH_COUNT", STRING_NEW_GC(buf, FALSE));
+            uobject_put(gRootObject, "MATCH_COUNT", STRING_NEW_GC(buf, FALSE));
 
             if(match_count > 0) {
                 if(SFD(nextin).fdbuf.mBufLen == 0) {

--- a/src/gc.c
+++ b/src/gc.c
@@ -200,17 +200,18 @@ void gc_init(int pool_size)
     gCompletionObject = UOBJECT_NEW_GC(8, gRootObject, "compl", FALSE);
     uobject_init(gCompletionObject);
 
-    hash_put(gRootObject, "compl", gCompletionObject);
+    uobject_put(gRootObject, "compl", gCompletionObject);
 
     gxyzshObject = UOBJECT_NEW_GC(8, NULL, "xyzsh", FALSE);
     gStackFrames = VECTOR_NEW_GC(8, FALSE);
-    hash_put(gxyzshObject, "_stackframes", gStackFrames);
+    uobject_put(gxyzshObject, "_stackframes", gStackFrames);
 }
 
 void gc_final()
 {
     /// sweep all user objects ///
-    hash_clear(gRootObject);
+    uobject_clear(gRootObject);
+    uobject_clear(gxyzshObject);
     if(gAppType == kATConsoleApp) {
         printf("sweeped %d objects...\n", gc_sweep());
     }

--- a/src/hash.c
+++ b/src/hash.c
@@ -1,6 +1,7 @@
 #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) 
@@ -92,6 +93,7 @@ sObject* hash_new_from_stack(int size)
 
 void hash_delete_gc(sObject* self)
 {
+   assert(TYPE(self) == T_HASH);
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -105,6 +107,7 @@ void hash_delete_gc(sObject* self)
 
 void hash_delete_stack(sObject* self)
 {
+   assert(TYPE(self) == T_HASH);
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -118,6 +121,7 @@ void hash_delete_stack(sObject* self)
 
 void hash_delete_malloc(sObject* self)
 {
+   assert(TYPE(self) == T_HASH);
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -133,6 +137,8 @@ void hash_delete_malloc(sObject* self)
 
 static unsigned int get_hash_value(sObject* self, char* key)
 {
+   assert(TYPE(self) == T_HASH);
+
    unsigned int i = 0;
    while(*key) {
       i += *key;
@@ -144,6 +150,7 @@ static unsigned int get_hash_value(sObject* self, char* key)
 
 static void resize(sObject* self) 
 {
+    assert(TYPE(self) == T_HASH);
     const int table_size = SHASH(self).mTableSize;
 
     SHASH(self).mTableSize *= 5;
@@ -165,6 +172,8 @@ static void resize(sObject* self)
 
 void hash_put(sObject* self, char* key, void* item)
 {
+    assert(TYPE(self) == T_HASH);
+
     if(SHASH(self).mCounter >= SHASH(self).mTableSize) {
         resize(self);
     }
@@ -190,6 +199,7 @@ void hash_put(sObject* self, char* key, void* item)
 
 static void erase_from_list(sObject* self, hash_it* rit)
 {
+   assert(TYPE(self) == T_HASH);
    if(rit == SHASH(self).mEntryIt) {
       SHASH(self).mEntryIt = rit->mNextIt;
    }
@@ -209,6 +219,7 @@ static void erase_from_list(sObject* self, hash_it* rit)
          
 BOOL hash_erase(sObject* self, char* key)
 {
+   assert(TYPE(self) == T_HASH);
    const unsigned int hash_value = get_hash_value(self, key);
    hash_it* it = SHASH(self).mTable[hash_value];
    
@@ -249,6 +260,7 @@ BOOL hash_erase(sObject* self, char* key)
 
 void hash_clear(sObject* self)
 {
+   assert(TYPE(self) == T_HASH);
    int i;
    int max;
    hash_it* it = SHASH(self).mEntryIt;
@@ -267,6 +279,7 @@ void hash_clear(sObject* self)
 
 void hash_replace(sObject* self, char* key, void* item)
 {
+   assert(TYPE(self) == T_HASH);
    hash_it* it = SHASH(self).mTable[get_hash_value(self, key)];
 
    if(it) {
@@ -283,6 +296,8 @@ void hash_replace(sObject* self, char* key, void* item)
 
 void hash_show(sObject* self, char* fname)
 {
+   assert(TYPE(self) == T_HASH);
+
    char tmp[8096];
    int i;
    int max;
@@ -318,6 +333,8 @@ void hash_show(sObject* self, char* fname)
 
 void* hash_item(sObject* self, char* key)
 {
+   assert(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mTable[ get_hash_value(self, key) ];
 
    while(it) {
@@ -330,6 +347,8 @@ void* hash_item(sObject* self, char* key)
 
 void* hash_item_addr(sObject* self, char* key)
 {
+   assert(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mTable[ get_hash_value(self, key) ];
    while(it) {
       if(strcmp(key, it->mKey) == 0) return &it->mItem;
@@ -341,6 +360,8 @@ void* hash_item_addr(sObject* self, char* key)
    
 char* hash_key(sObject* self, void* item)
 {
+   assert(TYPE(self) == T_HASH);
+
    hash_it* it = SHASH(self).mEntryIt;
 
    while(it) {
@@ -353,16 +374,37 @@ char* hash_key(sObject* self, void* item)
 
 int hash_count(sObject* self)
 {
+   assert(TYPE(self) == T_HASH);
+
    return SHASH(self).mCounter;
 }   
 
-hash_it* hash_loop_begin(sObject* self) { return SHASH(self).mEntryIt; }
-void* hash_loop_item(hash_it* it) { return it->mItem; }
-char* hash_loop_key(hash_it* it) { return it->mKey; }
-hash_it* hash_loop_next(hash_it* it) { return it->mNextIt; }
+hash_it* hash_loop_begin(sObject* self) 
+{ 
+    assert(TYPE(self) == T_HASH); 
+
+    return SHASH(self).mEntryIt; 
+}
+
+void* hash_loop_item(hash_it* it) 
+{ 
+    return it->mItem; 
+}
+
+char* hash_loop_key(hash_it* it)
+{ 
+    return it->mKey; 
+}
+
+hash_it* hash_loop_next(hash_it* it) 
+{ 
+    return it->mNextIt; 
+}
 
 int hash_gc_children_mark(sObject* self)
 {
+    assert(TYPE(self) == T_HASH);
+
     int count = 0;
 
     hash_it* it = SHASH(self).mEntryIt;

--- a/src/interface.c
+++ b/src/interface.c
@@ -93,6 +93,7 @@ static char* prompt()
     char* buf = readline(SFD(nextout).fdbuf.mBuf);
 
     (void)vector_pop_back(gStackFrames);
+
     stack_end_stack();
 
     return buf;
@@ -118,13 +119,12 @@ BOOL xyzsh_run(int* rcode, sObject* block, char* source_name, fXyzshJobDone xyzs
     for(i=0; i<argc; i++) {
         vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
     }
-    hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+    uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
     SFUN(fun).mRunInfo = NULL;
 
     if(!run(block, nextin, nextout, rcode, current_object, fun)) {
         xyzsh_restore_signal_default();
-
         (void)vector_pop_back(gStackFrames);
 
         stack_end_stack();
@@ -137,7 +137,6 @@ BOOL xyzsh_run(int* rcode, sObject* block, char* source_name, fXyzshJobDone xyzs
     xyzsh_restore_signal_default();
 
     (void)vector_pop_back(gStackFrames);
-
     stack_end_stack();
 
     /// wait background job
@@ -286,15 +285,13 @@ BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_poin
             for(i=0; i<argc; i++) {
                 vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
             }
-            hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+            uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
             SFUN(fun).mRunInfo = NULL;
 
             if(!run(block, gStdin, gStdout, rcode, gCurrentObject, fun)) {
                 xyzsh_restore_signal_default();
                 
-                (void)vector_pop_back(gStackFrames);
-
                 if(*rcode == RCODE_BREAK) {
                     fprintf(stderr, "invalid break. Not in a loop\n");
                 }
@@ -319,6 +316,7 @@ BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_poin
                 if(*rcode != 0) {
                     fprintf(stderr, "return code is %d\n", *rcode);
                 }
+                (void)vector_pop_back(gStackFrames);
                 stack_end_stack();
 
                 /// wait background job
@@ -328,9 +326,8 @@ BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_poin
 
                 return FALSE;
             }
-            readline_signal();
-
             (void)vector_pop_back(gStackFrames);
+            readline_signal();
         }
         else {
             xyzsh_restore_signal_default();
@@ -448,7 +445,7 @@ void xyzsh_readline_interface(char* cmdline, int cursor_point, char** argv, int
                 for(i=0; i<argc; i++) {
                     vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
                 }
-                hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+                uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
                 SFUN(fun).mRunInfo = NULL;
 
@@ -462,7 +459,6 @@ void xyzsh_readline_interface(char* cmdline, int cursor_point, char** argv, int
                     }
                     else if(rcode == RCODE_EXIT) {
                         stack_end_stack();
-                        (void)vector_pop_back(gStackFrames);
                         break;
                     }
                     else {
@@ -470,9 +466,8 @@ void xyzsh_readline_interface(char* cmdline, int cursor_point, char** argv, int
                         fprintf(stderr, "%s", string_c_str(gErrMsg));
                     }
                 }
-                readline_signal();
-
                 (void)vector_pop_back(gStackFrames);
+                readline_signal();
             }
             else {
                 fprintf(stderr, "parser error\n");
@@ -560,7 +555,7 @@ void xyzsh_opt_c(char* cmd, char** argv, int argc)
         for(i=0; i<argc; i++) {
             vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
         }
-        hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+        uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
         if(!run(block, gStdin, gStdout, &rcode, gRootObject, fun)) {
             if(rcode == RCODE_BREAK) {
@@ -576,8 +571,8 @@ void xyzsh_opt_c(char* cmd, char** argv, int argc)
                 fprintf(stderr, "%s", string_c_str(gErrMsg));
             }
         }
-        xyzsh_restore_signal_default();
         (void)vector_pop_back(gStackFrames);
+        xyzsh_restore_signal_default();
     }
     else {
         fprintf(stderr, "parser error\n");
@@ -620,6 +615,6 @@ void xyzsh_add_inner_command(sObject* object, char* name, fXyzshNativeFun comman
     }
     va_end(args);
 
-    hash_put(object, name, nfun);
+    uobject_put(object, name, nfun);
 }
 

--- a/src/object.c
+++ b/src/object.c
@@ -3,272 +3,6 @@
 #include <string.h>
 #include <stdio.h>
 
-sObject* uobject_new_from_gc(int size, sObject* parent, char* name, BOOL user_object)
-{
-   sObject* self = gc_get_free_object(T_UOBJECT, user_object);
-   
-   SHASH(self).mTableSize = size;
-   SHASH(self).mTable = (hash_it**)MALLOC(sizeof(hash_it*) * size);
-   memset(SHASH(self).mTable, 0, sizeof(hash_it*)*size);
-
-   SHASH(self).mEntryIt = NULL;
-
-   SHASH(self).mCounter = 0;
-
-   if(parent) SUOBJECT(self).mParent = parent; else SUOBJECT(self).mParent = self;
-
-   SUOBJECT(self).mName = STRDUP(name);
-
-   return self;
-}
-
-sObject* uobject_new_from_stack(int size, sObject* parent, char* name)
-{
-   sObject* self = stack_get_free_object(T_UOBJECT);
-   
-   SHASH(self).mTableSize = size;
-   SHASH(self).mTable = (hash_it**)MALLOC(sizeof(hash_it*) * size);
-   memset(SHASH(self).mTable, 0, sizeof(hash_it*)*size);
-
-   SHASH(self).mEntryIt = NULL;
-
-   SHASH(self).mCounter = 0;
-
-   if(parent) SUOBJECT(self).mParent = parent; else SUOBJECT(self).mParent = self;
-
-   SUOBJECT(self).mName = STRDUP(name);
-
-   return self;
-}
-
-sObject* gInherit;
-
-void uobject_root_init(sObject* self)
-{
-    hash_put(self, "unset", NFUN_NEW_GC(cmd_unset, NULL, TRUE));
-    sObject* readline = UOBJECT_NEW_GC(8, self, "rl", TRUE);
-    uobject_init(readline);
-    hash_put(self, "rl", readline);
-
-    hash_put(readline, "insert_text", NFUN_NEW_GC(cmd_readline_insert_text, NULL, TRUE));
-    hash_put(readline, "delete_text", NFUN_NEW_GC(cmd_readline_delete_text, NULL, TRUE));
-    hash_put(readline, "clear_screen", NFUN_NEW_GC(cmd_readline_clear_screen, NULL, TRUE));
-    hash_put(readline, "point_move", NFUN_NEW_GC(cmd_readline_point_move, NULL, TRUE));
-    hash_put(readline, "read_history", NFUN_NEW_GC(cmd_readline_read_history, NULL, TRUE));
-    hash_put(readline, "write_history", NFUN_NEW_GC(cmd_readline_write_history, NULL, TRUE));
-    hash_put(self, "completion", NFUN_NEW_GC(cmd_completion, NULL, TRUE));
-    hash_put(self, "p", NFUN_NEW_GC(cmd_p, NULL, TRUE));
-    hash_put(self, "jobs", NFUN_NEW_GC(cmd_jobs, NULL, TRUE));
-    hash_put(self, "gcinfo", NFUN_NEW_GC(cmd_gcinfo, NULL, TRUE));
-    hash_put(self, "stackinfo", NFUN_NEW_GC(cmd_stackinfo, NULL, TRUE));
-    hash_put(self, "fg", NFUN_NEW_GC(cmd_fg, NULL, TRUE));
-    hash_put(self, "exit", NFUN_NEW_GC(cmd_exit, NULL, TRUE));
-    hash_put(self, "fselector", NFUN_NEW_GC(cmd_fselector, NULL, TRUE));
-    hash_put(self, "sweep", NFUN_NEW_GC(cmd_sweep, NULL, TRUE));
-    hash_put(self, "subshell", NFUN_NEW_GC(cmd_subshell, NULL, TRUE));
-    hash_put(self, "print", NFUN_NEW_GC(cmd_print, NULL, TRUE));
-    hash_put(self, "if", NFUN_NEW_GC(cmd_if, NULL, TRUE));
-    hash_put(self, "break", NFUN_NEW_GC(cmd_break, NULL, TRUE));
-    hash_put(self, "while", NFUN_NEW_GC(cmd_while, NULL, TRUE));
-    hash_put(self, "return", NFUN_NEW_GC(cmd_return, NULL, TRUE));
-    hash_put(self, "rehash", NFUN_NEW_GC(cmd_rehash, NULL, TRUE));
-    hash_put(self, "true", NFUN_NEW_GC(cmd_true, NULL, TRUE));
-    hash_put(self, "false", NFUN_NEW_GC(cmd_false, NULL, TRUE));
-    hash_put(self, "write", NFUN_NEW_GC(cmd_write, NULL, TRUE));
-    hash_put(self, "quote", NFUN_NEW_GC(cmd_quote, NULL, TRUE));
-    hash_put(self, "load", NFUN_NEW_GC(cmd_load, NULL, TRUE));
-    gInherit = NFUN_NEW_GC(cmd_inherit, NULL, TRUE);
-    hash_put(self, "inherit", gInherit);
-    hash_put(self, "eval", NFUN_NEW_GC(cmd_eval, NULL, TRUE));
-    hash_put(self, "object", NFUN_NEW_GC(cmd_object, NULL, TRUE));
-    hash_put(self, "pwo", NFUN_NEW_GC(cmd_pwo, NULL, TRUE));
-    hash_put(self, "co", NFUN_NEW_GC(cmd_co, NULL, TRUE));
-    hash_put(self, "ref", NFUN_NEW_GC(cmd_ref, NULL, TRUE));
-    hash_put(self, "length", NFUN_NEW_GC(cmd_length, NULL, TRUE));
-    hash_put(self, "export", NFUN_NEW_GC(cmd_export, NULL, TRUE));
-    hash_put(self, "x", NFUN_NEW_GC(cmd_x , NULL, TRUE));
-    hash_put(self, "stackframe", NFUN_NEW_GC(cmd_stackframe, NULL, TRUE));
-    hash_put(self, "msleep", NFUN_NEW_GC(cmd_msleep, NULL, TRUE));
-    hash_put(self, "raise", NFUN_NEW_GC(cmd_raise, NULL, TRUE));
-    hash_put(self, "cd", NFUN_NEW_GC(cmd_cd, NULL, TRUE));
-    hash_put(self, "popd", NFUN_NEW_GC(cmd_popd, NULL, TRUE));
-    hash_put(self, "pushd", NFUN_NEW_GC(cmd_pushd, NULL, TRUE));
-    hash_put(self, "block", NFUN_NEW_GC(cmd_block, NULL, TRUE));
-    hash_put(self, "lc", NFUN_NEW_GC(cmd_lc, NULL, TRUE));
-    hash_put(self, "uc", NFUN_NEW_GC(cmd_uc, NULL, TRUE));
-    hash_put(self, "chomp", NFUN_NEW_GC(cmd_chomp, NULL, TRUE));
-    hash_put(self, "chop", NFUN_NEW_GC(cmd_chop, NULL, TRUE));
-    hash_put(self, "pomch", NFUN_NEW_GC(cmd_pomch, NULL, TRUE));
-    hash_put(self, "funinfo", NFUN_NEW_GC(cmd_funinfo, NULL, TRUE));
-    hash_put(self, "printf", NFUN_NEW_GC(cmd_printf, NULL, TRUE));
-    hash_put(self, "join", NFUN_NEW_GC(cmd_join, NULL, TRUE));
-    hash_put(self, "lines", NFUN_NEW_GC(cmd_lines, NULL, TRUE));
-    hash_put(self, "rows", NFUN_NEW_GC(cmd_rows, NULL, TRUE));
-    hash_put(self, "scan", NFUN_NEW_GC(cmd_scan, NULL, TRUE));
-    hash_put(self, "split", NFUN_NEW_GC(cmd_split, NULL, TRUE));
-    hash_put(self, "try", NFUN_NEW_GC(cmd_try, NULL, TRUE));
-    hash_put(self, "errmsg", NFUN_NEW_GC(cmd_errmsg, NULL, TRUE));
-    hash_put(self, "prompt", NFUN_NEW_GC(cmd_prompt, NULL, TRUE));
-
-    hash_put(self, "-n", NFUN_NEW_GC(cmd_condition_n, NULL, TRUE));
-    hash_put(self, "-z", NFUN_NEW_GC(cmd_condition_z, NULL, TRUE));
-    hash_put(self, "-b", NFUN_NEW_GC(cmd_condition_b, NULL, TRUE));
-    hash_put(self, "-c", NFUN_NEW_GC(cmd_condition_c, NULL, TRUE));
-    hash_put(self, "-d", NFUN_NEW_GC(cmd_condition_d, NULL, TRUE));
-    hash_put(self, "-f", NFUN_NEW_GC(cmd_condition_f, NULL, TRUE));
-    hash_put(self, "-h", NFUN_NEW_GC(cmd_condition_h, NULL, TRUE));
-    hash_put(self, "-L", NFUN_NEW_GC(cmd_condition_l, NULL, TRUE));
-    hash_put(self, "-p", NFUN_NEW_GC(cmd_condition_p, NULL, TRUE));
-    hash_put(self, "-t", NFUN_NEW_GC(cmd_condition_t, NULL, TRUE));
-    hash_put(self, "-S", NFUN_NEW_GC(cmd_condition_s2, NULL, TRUE));
-    hash_put(self, "-g", NFUN_NEW_GC(cmd_condition_g, NULL, TRUE));
-    hash_put(self, "-k", NFUN_NEW_GC(cmd_condition_k, NULL, TRUE));
-    hash_put(self, "-u", NFUN_NEW_GC(cmd_condition_u, NULL, TRUE));
-    hash_put(self, "-r", NFUN_NEW_GC(cmd_condition_r, NULL, TRUE));
-    hash_put(self, "-w", NFUN_NEW_GC(cmd_condition_w, NULL, TRUE));
-    hash_put(self, "-x", NFUN_NEW_GC(cmd_condition_x, NULL, TRUE));
-    hash_put(self, "-O", NFUN_NEW_GC(cmd_condition_o, NULL, TRUE));
-    hash_put(self, "-G", NFUN_NEW_GC(cmd_condition_g2, NULL, TRUE));
-    hash_put(self, "-e", NFUN_NEW_GC(cmd_condition_e, NULL, TRUE));
-    hash_put(self, "-s", NFUN_NEW_GC(cmd_condition_s, NULL, TRUE));
-    hash_put(self, "=", NFUN_NEW_GC(cmd_condition_eq, NULL, TRUE));
-    hash_put(self, "!=", NFUN_NEW_GC(cmd_condition_neq, NULL, TRUE));
-    hash_put(self, "-slt", NFUN_NEW_GC(cmd_condition_slt, NULL, TRUE));
-    hash_put(self, "-sgt", NFUN_NEW_GC(cmd_condition_sgt, NULL, TRUE));
-    hash_put(self, "-sle", NFUN_NEW_GC(cmd_condition_sle, NULL, TRUE));
-    hash_put(self, "-sge", NFUN_NEW_GC(cmd_condition_sge, NULL, TRUE));
-    hash_put(self, "-eq", NFUN_NEW_GC(cmd_condition_eq2, NULL, TRUE));
-    hash_put(self, "-ne", NFUN_NEW_GC(cmd_condition_ne, NULL, TRUE));
-    hash_put(self, "-lt", NFUN_NEW_GC(cmd_condition_lt, NULL, TRUE));
-    hash_put(self, "-le", NFUN_NEW_GC(cmd_condition_le, NULL, TRUE));
-    hash_put(self, "-gt", NFUN_NEW_GC(cmd_condition_gt, NULL, TRUE));
-    hash_put(self, "-ge", NFUN_NEW_GC(cmd_condition_ge, NULL, TRUE));
-    hash_put(self, "-nt", NFUN_NEW_GC(cmd_condition_nt, NULL, TRUE));
-    hash_put(self, "-ot", NFUN_NEW_GC(cmd_condition_ot, NULL, TRUE));
-    hash_put(self, "-ef", NFUN_NEW_GC(cmd_condition_ef, NULL, TRUE));
-    hash_put(self, "=~", NFUN_NEW_GC(cmd_condition_re, NULL, TRUE));
-    hash_put(self, "++", NFUN_NEW_GC(cmd_plusplus, NULL, TRUE));
-    hash_put(self, "--", NFUN_NEW_GC(cmd_minusminus, NULL, TRUE));
-    hash_put(self, "+", NFUN_NEW_GC(cmd_plus, NULL, TRUE));
-    hash_put(self, "-", NFUN_NEW_GC(cmd_minus, NULL, TRUE));
-    hash_put(self, "*", NFUN_NEW_GC(cmd_mult, NULL, TRUE));
-    hash_put(self, "/", NFUN_NEW_GC(cmd_div, NULL, TRUE));
-    hash_put(self, "mod", NFUN_NEW_GC(cmd_mod, NULL, TRUE));
-    hash_put(self, "pow", NFUN_NEW_GC(cmd_pow, NULL, TRUE));
-    hash_put(self, "abs", NFUN_NEW_GC(cmd_abs, NULL, TRUE));
-    hash_put(self, "selector", NFUN_NEW_GC(cmd_selector, NULL, TRUE));
-    hash_put(self, "sort", NFUN_NEW_GC(cmd_sort, NULL, TRUE));
-    hash_put(self, "readline", NFUN_NEW_GC(cmd_readline, NULL, TRUE));
-#if defined(HAVE_MIGEMO_H)
-    hash_put(self, "migemo_match", NFUN_NEW_GC(cmd_migemo_match, NULL, TRUE));
-#endif
-
-    hash_put(self, "sub", NFUN_NEW_GC(cmd_sub, NULL, TRUE));
-    hash_put(self, "time", NFUN_NEW_GC(cmd_time, NULL, TRUE));
-
-    sObject* nfun = NFUN_NEW_GC(cmd_hash, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-key"));
-    hash_put(self, "hash", nfun);
-    nfun = NFUN_NEW_GC(cmd_ary, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-append"));
-    hash_put(self, "ary", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_var, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
-    hash_put(self, "var", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_add, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
-    hash_put(self, "add", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_del, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
-    hash_put(self, "del", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_index, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-count"));
-    hash_put(self, "index", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_rindex, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-count"));
-    hash_put(self, "rindex", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_each, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
-    hash_put(self, "each", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_def, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-option-with-argument"));
-    hash_put(self, "def", nfun);
-
-    nfun = NFUN_NEW_GC(cmd_class, NULL, TRUE);
-    (void)nfun_put_option_with_argument(nfun, STRDUP("-option-with-argument"));
-    hash_put(self, "class", nfun);
-
-    clear_matching_info_variable();
-}
-
-void uobject_init(sObject* self)
-{
-    hash_put(self, "run", NFUN_NEW_GC(cmd_mrun, NULL, FALSE));
-    hash_put(self, "self", self);
-    hash_put(self, "root", gRootObject);
-    hash_put(self, "parent", SUOBJECT(self).mParent);
-    hash_put(self, "show", NFUN_NEW_GC(cmd_mshow, NULL, FALSE));
-}
-
-void uobject_delete_gc(sObject* self)
-{
-   hash_it* it = SHASH(self).mEntryIt;
-
-   while(it) {
-      hash_it* next_it = it->mNextIt;
-      hash_it_release(it, self);
-      it = next_it;
-   }
-   
-   FREE(SHASH(self).mTable);
-   FREE(SUOBJECT(self).mName);
-}
-
-void uobject_delete_stack(sObject* self)
-{
-   hash_it* it = SHASH(self).mEntryIt;
-
-   while(it) {
-      hash_it* next_it = it->mNextIt;
-      hash_it_release(it, self);
-      it = next_it;
-   }
-   
-   FREE(SHASH(self).mTable);
-   FREE(SUOBJECT(self).mName);
-}
-
-int uobject_gc_children_mark(sObject* self)
-{
-    int count = 0;
-
-    hash_it* it = SHASH(self).mEntryIt;
-    while(it) {
-        sObject* item = it->mItem;
-
-        if((item->mFlg & GC_MARK) == 0) {
-            item->mFlg |= GC_MARK;
-            count++;
-
-            count += object_gc_children_mark(item);
-        }
-
-        it = it->mNextIt;
-    }
-
-    return count;
-}
-
 sObject* nfun_new_from_gc(fXyzshNativeFun fun, sObject* parent, BOOL user_object)
 {
    sObject* self = gc_get_free_object(T_NFUN, user_object);
@@ -370,12 +104,12 @@ sObject* access_object(char* name, sObject** current, sObject* running_object)
 {
     sObject* object;
     if(running_object) {
-        object = hash_item(SFUN(running_object).mLocalObjects, name);
+        object = uobject_item(SFUN(running_object).mLocalObjects, name);
         if(object) { return object; }
     }
 
     while(1) {
-        object = hash_item(*current, name);
+        object = uobject_item(*current, name);
 
         if(object || *current == gRootObject) { return object; }
 
@@ -385,10 +119,10 @@ sObject* access_object(char* name, sObject** current, sObject* running_object)
 
 sObject* access_object2(char* name, sObject* current, sObject* running_object)
 {
-    sObject* object = hash_item(SFUN(running_object).mLocalObjects, name);
+    sObject* object = uobject_item(SFUN(running_object).mLocalObjects, name);
     if(object) return object;
 
-    return hash_item(current, name);
+    return uobject_item(current, name);
 }
 
 sObject* access_object3(char* name, sObject** current)
@@ -396,7 +130,7 @@ sObject* access_object3(char* name, sObject** current)
     sObject* object;
 
     while(1) {
-        object = hash_item(*current, name);
+        object = uobject_item(*current, name);
 
         if(object || *current == gRootObject) { return object; }
 

--- a/src/parser.c
+++ b/src/parser.c
@@ -865,7 +865,7 @@ static BOOL read_command(char** p, sCommand* command, sStatment* statment, sObje
                         if(object && TYPE(object) == T_UOBJECT) {
                             int i;
                             for(i=1; i<command->mMessagesNum; i++) {
-                                object = hash_item(object, command->mMessages[i]);
+                                object = uobject_item(object, command->mMessages[i]);
 
                                 if(object == NULL || TYPE(object) != T_UOBJECT) {
                                     break;

--- a/src/readline.c
+++ b/src/readline.c
@@ -57,7 +57,7 @@ static char* message_completion(const char* text, int stat)
         sObject* messages = STRING_NEW_STACK("");
 
         while(1) {
-            object = hash_item(current, command->mMessages[0]);
+            object = uobject_item(current, command->mMessages[0]);
             if(object || current == gRootObject) break;
             current = SUOBJECT((current)).mParent;
         }
@@ -68,17 +68,17 @@ static char* message_completion(const char* text, int stat)
         if(object && TYPE(object) == T_UOBJECT) {
             int i;
             for(i=1; i<command->mMessagesNum; i++) {
-                object = hash_item(object, command->mMessages[i]);
+                object = uobject_item(object, command->mMessages[i]);
                 if(object == NULL || TYPE(object) != T_UOBJECT) break;
                 string_push_back(messages, command->mMessages[i]);
                 string_push_back(messages, "::");
             }
 
             if(object && TYPE(object) == T_UOBJECT) {
-                hash_it* it = hash_loop_begin(object);
+                uobject_it* it = uobject_loop_begin(object);
                 while(it) {
-                    char* key = hash_loop_key(it);
-                    sObject* item = hash_loop_item(it);
+                    char* key = uobject_loop_key(it);
+                    sObject* item = uobject_loop_item(it);
 
                     sObject* candidate = STRING_NEW_STACK(string_c_str(messages));
                     string_push_back(candidate, key);
@@ -96,7 +96,7 @@ static char* message_completion(const char* text, int stat)
                         vector_add(gCompletionArray, string_c_str(candidate));
                     }
 
-                    it = hash_loop_next(it);
+                    it = uobject_loop_next(it);
                 }
 
                 vector_sort(gCompletionArray, name_sort);
@@ -136,21 +136,21 @@ static char* all_program_completion(const char* text, int stat)
 
         sObject* current = gReadlineCurrentObject;
         while(1) {
-            hash_it* it = hash_loop_begin(current);
+            uobject_it* it = uobject_loop_begin(current);
             while(it) {
-                char* key = hash_loop_key(it);
-                sObject* object = hash_loop_item(it);
+                char* key = uobject_loop_key(it);
+                sObject* object = uobject_loop_item(it);
 
                 if(hash_item(hash, key) == NULL) {
                     hash_put(hash, key, object);
 
-                    sObject* candidate = STRING_NEW_STACK(hash_loop_key(it));
+                    sObject* candidate = STRING_NEW_STACK(uobject_loop_key(it));
                     if(TYPE(object) == T_UOBJECT) {
-                        if(hash_item(object, "main")) {
+                        if(uobject_item(object, "main")) {
                             vector_add(gCompletionArray, string_c_str(candidate));
                         }
                         else {
-                            sObject* candidate2 = STRING_NEW_STACK(hash_loop_key(it));
+                            sObject* candidate2 = STRING_NEW_STACK(uobject_loop_key(it));
                             string_push_back(candidate2, "::");
                             vector_add(gCompletionArray, string_c_str(candidate2));
                         }
@@ -160,7 +160,7 @@ static char* all_program_completion(const char* text, int stat)
                     }
                 }
 
-                it = hash_loop_next(it);
+                it = uobject_loop_next(it);
             }
             
             if(current == gRootObject) break;
@@ -193,21 +193,21 @@ static char* program_completion(const char* text, int stat)
 
         sObject* current = gReadlineCurrentObject;
         while(1) {
-            hash_it* it = hash_loop_begin(current);
+            uobject_it* it = uobject_loop_begin(current);
             while(it) {
-                char* key = hash_loop_key(it);
-                sObject* object = hash_loop_item(it);
+                char* key = uobject_loop_key(it);
+                sObject* object = uobject_loop_item(it);
 
                 if(hash_item(hash, key) == NULL) {
                     hash_put(hash, key, object);
 
-                    sObject* candidate = STRING_NEW_STACK(hash_loop_key(it));
+                    sObject* candidate = STRING_NEW_STACK(uobject_loop_key(it));
                     if(TYPE(object) == T_UOBJECT) {
-                        if(hash_item(object, "main")) {
+                        if(uobject_item(object, "main")) {
                             vector_add(gCompletionArray, string_c_str(candidate));
                         }
                         else {
-                            sObject* candidate2 = STRING_NEW_STACK(hash_loop_key(it));
+                            sObject* candidate2 = STRING_NEW_STACK(uobject_loop_key(it));
                             string_push_back(candidate2, "::");
                             vector_add(gCompletionArray, string_c_str(candidate2));
                         }
@@ -217,7 +217,7 @@ static char* program_completion(const char* text, int stat)
                     }
                 }
 
-                it = hash_loop_next(it);
+                it = uobject_loop_next(it);
             }
             
             if(current == gRootObject) break;
@@ -328,23 +328,23 @@ static char* env_completion(const char* text, int stat_)
 
         sObject* current = gReadlineCurrentObject;
         while(1) {
-            hash_it* it = hash_loop_begin(current);
+            uobject_it* it = uobject_loop_begin(current);
             while(it) {
-                char* key = hash_loop_key(it);
-                sObject* object = hash_loop_item(it);
+                char* key = uobject_loop_key(it);
+                sObject* object = uobject_loop_item(it);
 
                 if(hash_item(hash, key) == NULL) {
                     if(TYPE(object) == T_STRING || TYPE(object) == T_VECTOR || TYPE(object) == T_HASH) {
                         hash_put(hash, key, object);
 
                         sObject* candidate = STRING_NEW_STACK("");
-                        string_push_back(candidate, hash_loop_key(it));
+                        string_push_back(candidate, uobject_loop_key(it));
 
                         vector_add(gCompletionArray, string_c_str(candidate));
                     }
                 }
 
-                it = hash_loop_next(it);
+                it = uobject_loop_next(it);
             }
             
             if(current == gRootObject) break;
@@ -407,7 +407,7 @@ static void get_current_completion_object(sObject** completion_object, sObject**
     if(*current_object != gRootObject) {
         sObject* parent_object = SUOBJECT(*current_object).mParent;
         get_current_completion_object(completion_object, &parent_object);
-        if(*completion_object) *completion_object = hash_item(*completion_object, SUOBJECT(*current_object).mName);
+        if(*completion_object) *completion_object = uobject_item(*completion_object, SUOBJECT(*current_object).mName);
     }
 }
 
@@ -416,7 +416,7 @@ static sObject* access_object_compl(char* name, sObject** current)
     sObject* object;
 
     while(1) {
-        object = hash_item(*current, name);
+        object = uobject_item(*current, name);
 
         if(object || *current == gCompletionObject) { return object; }
 
@@ -511,7 +511,7 @@ char** readline_on_complete(const char* text, int start, int end)
                     int i;
                     for(i=1; i<command->mMessagesNum; i++) {
                         if(object && TYPE(object) == T_UOBJECT) {
-                            object = hash_item(object, command->mMessages[i]);
+                            object = uobject_item(object, command->mMessages[i]);
                         }
                         else {
                             break;
@@ -519,10 +519,10 @@ char** readline_on_complete(const char* text, int start, int end)
                     }
 
                     if(object && TYPE(object) == T_UOBJECT) {
-                        ucompletion = hash_item(object, command->mArgs[0]);
+                        ucompletion = uobject_item(object, command->mArgs[0]);
 
                         if(ucompletion == NULL) {
-                            ucompletion = hash_item(object, "__all__");;
+                            ucompletion = uobject_item(object, "__all__");;
                         }
                     }
                     else {
@@ -599,7 +599,7 @@ char** readline_on_complete(const char* text, int start, int end)
                     vector_add(argv, STRING_NEW_GC("", FALSE));
                     vector_add(argv, STRING_NEW_GC("", FALSE));
                 }
-                hash_put(SFUN(fun).mLocalObjects, "ARGV", argv);
+                uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv);
 
                 int rcode = 0;
                 xyzsh_set_signal();
@@ -607,12 +607,12 @@ char** readline_on_complete(const char* text, int start, int end)
                     readline_signal();
                     fprintf(stderr, "\nrun time error\n");
                     fprintf(stderr, "%s", string_c_str(gErrMsg));
-                    vector_pop_back(gStackFrames);
+                    (void)vector_pop_back(gStackFrames);
                     stack_end_stack();
                     return NULL;
                 }
+                (void)vector_pop_back(gStackFrames);
                 readline_signal();
-                vector_pop_back(gStackFrames);
 
                 fd_split(nextout, kLF);
 
@@ -649,10 +649,10 @@ BOOL cmd_completion(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                     }
                     p+=2;
 
-                    sObject* object2 = hash_item(object, string_c_str(str));
+                    sObject* object2 = uobject_item(object, string_c_str(str));
                     if(object2 == NULL || TYPE(object2) !=T_UOBJECT) {
                         sObject* new_object = UOBJECT_NEW_GC(8, object, string_c_str(str), TRUE);
-                        hash_put(object, string_c_str(str), new_object);
+                        uobject_put(object, string_c_str(str), new_object);
                         uobject_init(new_object);
 
                         object = new_object;
@@ -668,7 +668,7 @@ BOOL cmd_completion(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
                 }
             }
             if(object && TYPE(object) == T_UOBJECT && string_c_str(str)[0] != 0) {
-                hash_put(object, string_c_str(str), COMPLETION_NEW_GC(block, FALSE));
+                uobject_put(object, string_c_str(str), COMPLETION_NEW_GC(block, FALSE));
             }
             else {
                 err_msg("There is no object", runinfo->mSName, runinfo->mSLine, command->mArgsRuntime[i]);
@@ -818,9 +818,9 @@ static int readline_macro(int count, int key)
                 fprintf(stderr, "%s", string_c_str(gErrMsg));
             }
         }
+        (void)vector_pop_back(gStackFrames);
         readline_signal();
         //xyzsh_restore_signal_default();
-        (void)vector_pop_back(gStackFrames);
     }
     else {
         fprintf(stderr, "parser error\n");

--- a/src/run.c
+++ b/src/run.c
@@ -39,7 +39,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);
-    hash_put(gxyzshObject, "_jobs", gJobs);
+    uobject_put(gxyzshObject, "_jobs", gJobs);
 
     xyzsh_job_done = NULL;
 
@@ -811,7 +811,7 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
     for(i=0; i<argc; i++) {
         vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
     }
-    hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+    uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
     sCommand* command = runinfo->mCommand;
     sObject* options = HASH_NEW_GC(16, FALSE);
@@ -825,7 +825,7 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
             }
         }
     }
-    hash_put(SFUN(fun).mLocalObjects, "OPTIONS", options);
+    uobject_put(SFUN(fun).mLocalObjects, "OPTIONS", options);
 
     sObject* arg_blocks = SFUN(fun).mArgBlocks;
     SFUN(fun).mArgBlocks = VECTOR_NEW_GC(16, FALSE);
@@ -849,10 +849,10 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
         }
     }
 
-runinfo->mRCode = rcode;
-
     (void)vector_pop_back(gStackFrames);
 
+runinfo->mRCode = rcode;
+
     SFUN(fun).mLocalObjects = local_objects;
     SFUN(fun).mArgBlocks = arg_blocks;
     SFUN(fun).mRunInfo = runinfo2;
@@ -955,7 +955,7 @@ static BOOL run_object(sObject* object, sObject* nextin, sObject* nextout, sRunI
             break;
 
         case T_UOBJECT: {
-            sObject* main_obj = hash_item(object, "main");
+            sObject* main_obj = uobject_item(object, "main");
             runinfo->mRecieverObject = object;
 
             if(main_obj) {
@@ -1254,7 +1254,7 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
                 while(i < command->mMessagesNum) {
                     if(object && TYPE(object) == T_UOBJECT) {
                         reciever = object;
-                        object = hash_item(object, command->mMessages[i++]);
+                        object = uobject_item(object, command->mMessages[i++]);
                     }
                     else {
                         err_msg("invalid message passing", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
@@ -1264,7 +1264,7 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
 
                 if(object && TYPE(object) == T_UOBJECT) {
                     reciever = object;
-                    object = hash_item(object, command->mArgs[0]);
+                    object = uobject_item(object, command->mArgs[0]);
 
                     if(object == gInherit) {
                         sObject* running_object = runinfo->mRunningObject;
@@ -1724,7 +1724,7 @@ BOOL load_file(char* fname, sObject* nextin, sObject* nextout, sRunInfo* runinfo
         for(i=0; i<argc; i++) {
             vector_add(argv2, STRING_NEW_GC(argv[i], FALSE));
         }
-        hash_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
+        uobject_put(SFUN(fun).mLocalObjects, "ARGV", argv2);
 
         if(!run(block, nextin, nextout, &rcode, runinfo->mCurrentObject, fun))
         {
@@ -1733,22 +1733,21 @@ BOOL load_file(char* fname, sObject* nextin, sObject* nextout, sRunInfo* runinfo
             else {
                 runinfo->mRCode = rcode;
 
-                stack_end_stack();
                 (void)vector_pop_back(gStackFrames);
+                stack_end_stack();
                 return FALSE;
             }
         }
+        (void)vector_pop_back(gStackFrames);
     }
     else {
         FREE(buf);
         sCommand* command = runinfo->mCommand;
         err_msg_adding("parser error", runinfo->mSName, runinfo->mSLine, "parser");
         stack_end_stack();
-        (void)vector_pop_back(gStackFrames);
         return FALSE;
     }
 
-    (void)vector_pop_back(gStackFrames);
     stack_end_stack();
 
     return TRUE;

--- /dev/null
+++ b/src/uobject.c
@@ -0,0 +1,428 @@
+#include "config.h"
+#include "xyzsh/xyzsh.h"
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
+static unsigned int get_uobject_value(sObject* self, char* key)
+{
+   unsigned int i = 0;
+   while(*key) {
+      i += *key;
+      key++;
+   }
+
+   return i % SUOBJECT(self).mTableSize;
+}
+
+static void resize(sObject* self) 
+{
+    const int table_size = SUOBJECT(self).mTableSize;
+
+    SUOBJECT(self).mTableSize *= 5;
+    FREE(SUOBJECT(self).mTable);
+    SUOBJECT(self).mTable = (uobject_it**)MALLOC(sizeof(uobject_it*) * SUOBJECT(self).mTableSize);
+    memset(SUOBJECT(self).mTable, 0, sizeof(uobject_it*)*SUOBJECT(self).mTableSize);
+
+    uobject_it* it = SUOBJECT(self).mEntryIt;
+    while(it) {
+        unsigned int uobject_key = get_uobject_value(self, it->mKey);
+
+        it->mCollisionIt = SUOBJECT(self).mTable[uobject_key];
+        
+        SUOBJECT(self).mTable[uobject_key] = it;
+
+        it = it->mNextIt;
+    }
+}
+
+
+uobject_it* uobject_it_new(char* key, void* item, uobject_it* coll_it, uobject_it* next_it, sObject* hash) 
+{
+   uobject_it* it = (uobject_it*)MALLOC(sizeof(uobject_it));
+
+   it->mKey = STRDUP(key);
+
+   it->mItem = item;
+   it->mCollisionIt = coll_it;
+
+   it->mNextIt = next_it;   
+
+   return it;
+}
+   
+void uobject_it_release(uobject_it* it, sObject* hash)
+{
+    FREE(it->mKey);
+      
+    FREE(it);
+}
+
+
+sObject* uobject_new_from_gc(int size, sObject* parent, char* name, BOOL user_object)
+{
+   sObject* self = gc_get_free_object(T_UOBJECT, user_object);
+   
+   SUOBJECT(self).mTableSize = size;
+   SUOBJECT(self).mTable = (uobject_it**)MALLOC(sizeof(uobject_it*) * size);
+   memset(SUOBJECT(self).mTable, 0, sizeof(uobject_it*)*size);
+
+   SUOBJECT(self).mEntryIt = NULL;
+
+   SUOBJECT(self).mCounter = 0;
+
+   if(parent) SUOBJECT(self).mParent = parent; else SUOBJECT(self).mParent = self;
+
+   SUOBJECT(self).mName = STRDUP(name);
+
+   return self;
+}
+
+sObject* uobject_new_from_stack(int size, sObject* parent, char* name)
+{
+   sObject* self = stack_get_free_object(T_UOBJECT);
+   
+   SUOBJECT(self).mTableSize = size;
+   SUOBJECT(self).mTable = (uobject_it**)MALLOC(sizeof(uobject_it*) * size);
+   memset(SUOBJECT(self).mTable, 0, sizeof(uobject_it*)*size);
+
+   SUOBJECT(self).mEntryIt = NULL;
+
+   SUOBJECT(self).mCounter = 0;
+
+   if(parent) SUOBJECT(self).mParent = parent; else SUOBJECT(self).mParent = self;
+
+   SUOBJECT(self).mName = STRDUP(name);
+
+   return self;
+}
+
+sObject* gInherit;
+
+void uobject_root_init(sObject* self)
+{
+    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);
+    uobject_init(readline);
+    uobject_put(self, "rl", readline);
+
+    uobject_put(readline, "insert_text", NFUN_NEW_GC(cmd_readline_insert_text, NULL, TRUE));
+    uobject_put(readline, "delete_text", NFUN_NEW_GC(cmd_readline_delete_text, NULL, TRUE));
+    uobject_put(readline, "clear_screen", NFUN_NEW_GC(cmd_readline_clear_screen, NULL, TRUE));
+    uobject_put(readline, "point_move", NFUN_NEW_GC(cmd_readline_point_move, NULL, TRUE));
+    uobject_put(readline, "read_history", NFUN_NEW_GC(cmd_readline_read_history, NULL, TRUE));
+    uobject_put(readline, "write_history", NFUN_NEW_GC(cmd_readline_write_history, NULL, TRUE));
+    uobject_put(self, "completion", NFUN_NEW_GC(cmd_completion, NULL, TRUE));
+    uobject_put(self, "p", NFUN_NEW_GC(cmd_p, NULL, TRUE));
+    uobject_put(self, "jobs", NFUN_NEW_GC(cmd_jobs, NULL, TRUE));
+    uobject_put(self, "gcinfo", NFUN_NEW_GC(cmd_gcinfo, NULL, TRUE));
+    uobject_put(self, "stackinfo", NFUN_NEW_GC(cmd_stackinfo, NULL, TRUE));
+    uobject_put(self, "fg", NFUN_NEW_GC(cmd_fg, NULL, TRUE));
+    uobject_put(self, "exit", NFUN_NEW_GC(cmd_exit, NULL, TRUE));
+    uobject_put(self, "fselector", NFUN_NEW_GC(cmd_fselector, NULL, TRUE));
+    uobject_put(self, "sweep", NFUN_NEW_GC(cmd_sweep, NULL, TRUE));
+    uobject_put(self, "subshell", NFUN_NEW_GC(cmd_subshell, NULL, TRUE));
+    uobject_put(self, "print", NFUN_NEW_GC(cmd_print, NULL, TRUE));
+    uobject_put(self, "if", NFUN_NEW_GC(cmd_if, NULL, TRUE));
+    uobject_put(self, "break", NFUN_NEW_GC(cmd_break, NULL, TRUE));
+    uobject_put(self, "while", NFUN_NEW_GC(cmd_while, NULL, TRUE));
+    uobject_put(self, "return", NFUN_NEW_GC(cmd_return, NULL, TRUE));
+    uobject_put(self, "rehash", NFUN_NEW_GC(cmd_rehash, NULL, TRUE));
+    uobject_put(self, "true", NFUN_NEW_GC(cmd_true, NULL, TRUE));
+    uobject_put(self, "false", NFUN_NEW_GC(cmd_false, NULL, TRUE));
+    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);
+    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));
+    uobject_put(self, "co", NFUN_NEW_GC(cmd_co, NULL, TRUE));
+    uobject_put(self, "ref", NFUN_NEW_GC(cmd_ref, NULL, TRUE));
+    uobject_put(self, "length", NFUN_NEW_GC(cmd_length, NULL, TRUE));
+    uobject_put(self, "export", NFUN_NEW_GC(cmd_export, NULL, TRUE));
+    uobject_put(self, "x", NFUN_NEW_GC(cmd_x , NULL, TRUE));
+    uobject_put(self, "stackframe", NFUN_NEW_GC(cmd_stackframe, NULL, TRUE));
+    uobject_put(self, "msleep", NFUN_NEW_GC(cmd_msleep, NULL, TRUE));
+    uobject_put(self, "raise", NFUN_NEW_GC(cmd_raise, NULL, TRUE));
+    uobject_put(self, "cd", NFUN_NEW_GC(cmd_cd, NULL, TRUE));
+    uobject_put(self, "popd", NFUN_NEW_GC(cmd_popd, NULL, TRUE));
+    uobject_put(self, "pushd", NFUN_NEW_GC(cmd_pushd, NULL, TRUE));
+    uobject_put(self, "block", NFUN_NEW_GC(cmd_block, NULL, TRUE));
+    uobject_put(self, "lc", NFUN_NEW_GC(cmd_lc, NULL, TRUE));
+    uobject_put(self, "uc", NFUN_NEW_GC(cmd_uc, NULL, TRUE));
+    uobject_put(self, "chomp", NFUN_NEW_GC(cmd_chomp, NULL, TRUE));
+    uobject_put(self, "chop", NFUN_NEW_GC(cmd_chop, NULL, TRUE));
+    uobject_put(self, "pomch", NFUN_NEW_GC(cmd_pomch, NULL, TRUE));
+    uobject_put(self, "funinfo", NFUN_NEW_GC(cmd_funinfo, NULL, TRUE));
+    uobject_put(self, "printf", NFUN_NEW_GC(cmd_printf, NULL, TRUE));
+    uobject_put(self, "join", NFUN_NEW_GC(cmd_join, NULL, TRUE));
+    uobject_put(self, "lines", NFUN_NEW_GC(cmd_lines, NULL, TRUE));
+    uobject_put(self, "rows", NFUN_NEW_GC(cmd_rows, NULL, TRUE));
+    uobject_put(self, "scan", NFUN_NEW_GC(cmd_scan, NULL, TRUE));
+    uobject_put(self, "split", NFUN_NEW_GC(cmd_split, NULL, TRUE));
+    uobject_put(self, "try", NFUN_NEW_GC(cmd_try, NULL, TRUE));
+    uobject_put(self, "errmsg", NFUN_NEW_GC(cmd_errmsg, NULL, TRUE));
+    uobject_put(self, "prompt", NFUN_NEW_GC(cmd_prompt, NULL, TRUE));
+    uobject_put(self, "defined", NFUN_NEW_GC(cmd_defined, NULL, TRUE));
+
+    uobject_put(self, "-n", NFUN_NEW_GC(cmd_condition_n, NULL, TRUE));
+    uobject_put(self, "-z", NFUN_NEW_GC(cmd_condition_z, NULL, TRUE));
+    uobject_put(self, "-b", NFUN_NEW_GC(cmd_condition_b, NULL, TRUE));
+    uobject_put(self, "-c", NFUN_NEW_GC(cmd_condition_c, NULL, TRUE));
+    uobject_put(self, "-d", NFUN_NEW_GC(cmd_condition_d, NULL, TRUE));
+    uobject_put(self, "-f", NFUN_NEW_GC(cmd_condition_f, NULL, TRUE));
+    uobject_put(self, "-h", NFUN_NEW_GC(cmd_condition_h, NULL, TRUE));
+    uobject_put(self, "-L", NFUN_NEW_GC(cmd_condition_l, NULL, TRUE));
+    uobject_put(self, "-p", NFUN_NEW_GC(cmd_condition_p, NULL, TRUE));
+    uobject_put(self, "-t", NFUN_NEW_GC(cmd_condition_t, NULL, TRUE));
+    uobject_put(self, "-S", NFUN_NEW_GC(cmd_condition_s2, NULL, TRUE));
+    uobject_put(self, "-g", NFUN_NEW_GC(cmd_condition_g, NULL, TRUE));
+    uobject_put(self, "-k", NFUN_NEW_GC(cmd_condition_k, NULL, TRUE));
+    uobject_put(self, "-u", NFUN_NEW_GC(cmd_condition_u, NULL, TRUE));
+    uobject_put(self, "-r", NFUN_NEW_GC(cmd_condition_r, NULL, TRUE));
+    uobject_put(self, "-w", NFUN_NEW_GC(cmd_condition_w, NULL, TRUE));
+    uobject_put(self, "-x", NFUN_NEW_GC(cmd_condition_x, NULL, TRUE));
+    uobject_put(self, "-O", NFUN_NEW_GC(cmd_condition_o, NULL, TRUE));
+    uobject_put(self, "-G", NFUN_NEW_GC(cmd_condition_g2, NULL, TRUE));
+    uobject_put(self, "-e", NFUN_NEW_GC(cmd_condition_e, NULL, TRUE));
+    uobject_put(self, "-s", NFUN_NEW_GC(cmd_condition_s, NULL, TRUE));
+    uobject_put(self, "=", NFUN_NEW_GC(cmd_condition_eq, NULL, TRUE));
+    uobject_put(self, "!=", NFUN_NEW_GC(cmd_condition_neq, NULL, TRUE));
+    uobject_put(self, "-slt", NFUN_NEW_GC(cmd_condition_slt, NULL, TRUE));
+    uobject_put(self, "-sgt", NFUN_NEW_GC(cmd_condition_sgt, NULL, TRUE));
+    uobject_put(self, "-sle", NFUN_NEW_GC(cmd_condition_sle, NULL, TRUE));
+    uobject_put(self, "-sge", NFUN_NEW_GC(cmd_condition_sge, NULL, TRUE));
+    uobject_put(self, "-eq", NFUN_NEW_GC(cmd_condition_eq2, NULL, TRUE));
+    uobject_put(self, "-ne", NFUN_NEW_GC(cmd_condition_ne, NULL, TRUE));
+    uobject_put(self, "-lt", NFUN_NEW_GC(cmd_condition_lt, NULL, TRUE));
+    uobject_put(self, "-le", NFUN_NEW_GC(cmd_condition_le, NULL, TRUE));
+    uobject_put(self, "-gt", NFUN_NEW_GC(cmd_condition_gt, NULL, TRUE));
+    uobject_put(self, "-ge", NFUN_NEW_GC(cmd_condition_ge, NULL, TRUE));
+    uobject_put(self, "-nt", NFUN_NEW_GC(cmd_condition_nt, NULL, TRUE));
+    uobject_put(self, "-ot", NFUN_NEW_GC(cmd_condition_ot, NULL, TRUE));
+    uobject_put(self, "-ef", NFUN_NEW_GC(cmd_condition_ef, NULL, TRUE));
+    uobject_put(self, "=~", NFUN_NEW_GC(cmd_condition_re, NULL, TRUE));
+    uobject_put(self, "++", NFUN_NEW_GC(cmd_plusplus, NULL, TRUE));
+    uobject_put(self, "--", NFUN_NEW_GC(cmd_minusminus, NULL, TRUE));
+    uobject_put(self, "+", NFUN_NEW_GC(cmd_plus, NULL, TRUE));
+    uobject_put(self, "-", NFUN_NEW_GC(cmd_minus, NULL, TRUE));
+    uobject_put(self, "*", NFUN_NEW_GC(cmd_mult, NULL, TRUE));
+    uobject_put(self, "/", NFUN_NEW_GC(cmd_div, NULL, TRUE));
+    uobject_put(self, "mod", NFUN_NEW_GC(cmd_mod, NULL, TRUE));
+    uobject_put(self, "pow", NFUN_NEW_GC(cmd_pow, NULL, TRUE));
+    uobject_put(self, "abs", NFUN_NEW_GC(cmd_abs, NULL, TRUE));
+    uobject_put(self, "selector", NFUN_NEW_GC(cmd_selector, NULL, TRUE));
+    uobject_put(self, "sort", NFUN_NEW_GC(cmd_sort, NULL, TRUE));
+    uobject_put(self, "readline", NFUN_NEW_GC(cmd_readline, NULL, TRUE));
+    uobject_put(self, "kanjicode", NFUN_NEW_GC(cmd_kanjicode, NULL, TRUE));
+#if defined(HAVE_MIGEMO_H)
+    uobject_put(self, "migemo_match", NFUN_NEW_GC(cmd_migemo_match, NULL, TRUE));
+#endif
+
+    uobject_put(self, "sub", NFUN_NEW_GC(cmd_sub, NULL, TRUE));
+    uobject_put(self, "time", NFUN_NEW_GC(cmd_time, NULL, TRUE));
+
+    sObject* nfun = NFUN_NEW_GC(cmd_hash, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-key"));
+    uobject_put(self, "hash", nfun);
+    nfun = NFUN_NEW_GC(cmd_ary, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-append"));
+    uobject_put(self, "ary", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_var, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
+    uobject_put(self, "var", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_add, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    uobject_put(self, "add", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_del, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    uobject_put(self, "del", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_index, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-count"));
+    uobject_put(self, "index", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_rindex, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-count"));
+    uobject_put(self, "rindex", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_each, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    uobject_put(self, "each", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_def, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-option-with-argument"));
+    uobject_put(self, "def", nfun);
+
+    nfun = NFUN_NEW_GC(cmd_class, NULL, TRUE);
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-option-with-argument"));
+    uobject_put(self, "class", nfun);
+
+    clear_matching_info_variable();
+}
+
+void uobject_init(sObject* self)
+{
+    assert(TYPE(self) == T_UOBJECT);
+
+    uobject_put(self, "run", NFUN_NEW_GC(cmd_mrun, NULL, FALSE));
+    uobject_put(self, "self", self);
+    uobject_put(self, "root", gRootObject);
+    uobject_put(self, "parent", SUOBJECT(self).mParent);
+    uobject_put(self, "show", NFUN_NEW_GC(cmd_mshow, NULL, FALSE));
+}
+
+void uobject_delete_gc(sObject* self)
+{
+   assert(TYPE(self) == T_UOBJECT);
+
+   uobject_it* it = SUOBJECT(self).mEntryIt;
+
+   while(it) {
+      uobject_it* next_it = it->mNextIt;
+      uobject_it_release(it, self);
+      it = next_it;
+   }
+   
+   FREE(SUOBJECT(self).mTable);
+   FREE(SUOBJECT(self).mName);
+}
+
+void uobject_delete_stack(sObject* self)
+{
+   assert(TYPE(self) == T_UOBJECT);
+
+   uobject_it* it = SUOBJECT(self).mEntryIt;
+
+   while(it) {
+      uobject_it* next_it = it->mNextIt;
+      uobject_it_release(it, self);
+      it = next_it;
+   }
+   
+   FREE(SUOBJECT(self).mTable);
+   FREE(SUOBJECT(self).mName);
+}
+
+int uobject_gc_children_mark(sObject* self)
+{
+    assert(TYPE(self) == T_UOBJECT);
+
+    int count = 0;
+
+    uobject_it* it = SUOBJECT(self).mEntryIt;
+    while(it) {
+        sObject* item = it->mItem;
+
+        if((item->mFlg & GC_MARK) == 0) {
+            item->mFlg |= GC_MARK;
+            count++;
+
+            count += object_gc_children_mark(item);
+        }
+
+        it = it->mNextIt;
+    }
+
+    return count;
+}
+
+void uobject_put(sObject* self, char* key, void* item)
+{
+    assert(TYPE(self) == T_UOBJECT);
+
+    if(SUOBJECT(self).mCounter >= SUOBJECT(self).mTableSize) {
+        resize(self);
+    }
+    
+    unsigned int uobject_key = get_uobject_value(self, key);
+    
+    uobject_it* it = SUOBJECT(self).mTable[ uobject_key ];
+    while(it) {
+        if(strcmp(key, it->mKey) == 0) {
+            it->mItem = item;
+            return;
+        }
+        it = it->mCollisionIt;
+    }
+    
+    uobject_it* new_it
+        = uobject_it_new(key, item, SUOBJECT(self).mTable[uobject_key], SUOBJECT(self).mEntryIt, self);
+    
+    SUOBJECT(self).mTable[uobject_key] = new_it;
+    SUOBJECT(self).mEntryIt = new_it;
+    SUOBJECT(self).mCounter++;
+}
+
+void* uobject_item(sObject* self, char* key)
+{
+   assert(TYPE(self) == T_UOBJECT);
+
+   uobject_it* it = SUOBJECT(self).mTable[ get_uobject_value(self, key) ];
+
+   while(it) {
+      if(strcmp(key, it->mKey) == 0) return it->mItem;
+      it = it->mCollisionIt;
+   }
+
+   return NULL;
+}
+
+void uobject_clear(sObject* self)
+{
+   assert(TYPE(self) == T_UOBJECT);
+
+   int i;
+   int max;
+   uobject_it* it = SUOBJECT(self).mEntryIt;
+
+   while(it) {
+      uobject_it* next_it = it->mNextIt;
+      uobject_it_release(it, self);
+      it = next_it;
+   }
+
+   memset(SUOBJECT(self).mTable, 0, sizeof(uobject_it*)*SUOBJECT(self).mTableSize);
+   
+   SUOBJECT(self).mEntryIt = NULL;
+   SUOBJECT(self).mCounter = 0;
+}
+
+uobject_it* uobject_loop_begin(sObject* self) 
+{ 
+    assert(TYPE(self) == T_UOBJECT); 
+
+    return SUOBJECT(self).mEntryIt; 
+}
+
+void* uobject_loop_item(uobject_it* it) 
+{ 
+    return it->mItem; 
+}
+
+char* uobject_loop_key(uobject_it* it)
+{ 
+    return it->mKey; 
+}
+
+uobject_it* uobject_loop_next(uobject_it* it) 
+{ 
+    return it->mNextIt; 
+}
+
+int uobject_count(sObject* self)
+{
+   assert(TYPE(self) == T_UOBJECT);
+
+   return SUOBJECT(self).mCounter;
+}   

--- a/src/xyzsh.c
+++ b/src/xyzsh.c
@@ -107,12 +107,12 @@ static void xyzsh_read_rc()
     xyzsh_read_rc_core(user_rc_path);
 
 
-//    hash_put(gRootObject, "test", sTestObj_new("AAA", 1));
+//    uobject_put(gRootObject, "test", sTestObj_new("AAA", 1));
 }
 
 void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 {
-    setenv("XYZSH_VERSION", "1.1.0", 1);
+    setenv("XYZSH_VERSION", "1.1.1", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;
@@ -132,7 +132,7 @@ void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
     xyzsh_readline_init(FALSE);
 
     gDirStack = VECTOR_NEW_GC(10, FALSE);
-    hash_put(gxyzshObject, "_dir_stack", gDirStack);
+    uobject_put(gxyzshObject, "_dir_stack", gDirStack);
 
     char* term_env = getenv("TERM");
     if(term_env != NULL && strcmp(term_env, "") != 0) {

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -307,11 +307,20 @@ typedef struct {
     BOOL mSuspended;
 } job_obj;
 
+typedef struct _uobject_it {
+   char* mKey;
+   
+   void* mItem;
+   struct _uobject_it* mCollisionIt;
+
+   struct _uobject_it* mNextIt;
+} uobject_it;
+
 typedef struct {          // a user object can be treated like a hash_obj
-   hash_it** mTable;
+   uobject_it** mTable;
    int mTableSize;
 
-   hash_it* mEntryIt;
+   uobject_it* mEntryIt;
 
    int mCounter;
 
@@ -438,8 +447,18 @@ sObject* extobj_new_from_gc(void* object, fExtObjMarkFun mark_fun, fExtObjFreeFu
 
 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);
+void uobject_put(sObject* self, char* key, void* item);
 void uobject_init(sObject* self);
 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)
@@ -478,6 +497,8 @@ 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);
 BOOL cmd_readline_read_history(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_readline_write_history(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
@@ -795,5 +816,7 @@ void readline_write_history();
 void readline_read_history();
 void xyzsh_read_rc_core(char* path);
 
+extern sObject* gStackFrames;
+
 #endif
 

--- a/xyzsh.xyzsh
+++ b/xyzsh.xyzsh
@@ -1,3 +1,5 @@
+kanjicode -byte
+
 ### make xyzsh setting directory ###
 print ~/.xyzsh | if(| -e) (
     | if(! | -d) (