Commit: 956cbb8d0e73207f2bf48d7c410c14cab7a92c10 - xyzsh (git)

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

Commit MetaInfo

• Révision: 956cbb8d0e73207f2bf48d7c410c14cab7a92c10 (tree)
• l'heure: 2013-01-06 00:10:33
• Auteur: ab25cq <ab25cq@gmai...>
• Commiter: ab25cq

Message de Log

1.2.9

Change Summary

• modified: CHANGELOG
• modified: TODO
• modified: configure
• modified: configure.in
• modified: help.xyzsh
• modified: src/block.c
• modified: src/class.c
• modified: src/cmd_base.c
• modified: src/cmd_obj.c
• modified: src/fun.c
• modified: src/hash.c
• modified: src/list.c
• modified: src/run.c
• modified: src/uobject.c
• modified: src/vector.c
• modified: src/xyzsh.c
• modified: src/xyzsh/block.h
• modified: src/xyzsh/xyzsh.h
• modified: xyzsh.xyzsh

Modification

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,28 @@
 
+2013 1月6日 version 1.2.9
+    
+    1. defとclassに-copy-stackframeオプションがつきました。xyzsh.xyzshで定義されているtimes関数で使われてます。
+
+    今までは
+
+    > ls | var -local a b c; times 3 ( a )
+    run time error
+    not found variable(a)
+
+    とtimesのブロック内から外のローカル変数にアクセスできませんでしたが
+
+    これからは
+
+    > ls | var -local a b c ; times 3 ( a )
+    bin
+    bin
+    bin
+
+    のようにブロックの外のローカル変数にアクセスできます。
+    times内で定義したローカル変数はtimesのブロックの外に出ると消えます。
+
+    2. ダイナミックライブラリーのバージョンアップ
+
 2013 4th January version 1.2.8
 
     1. Refactoring.

--- a/TODO
+++ b/TODO
@@ -2,9 +2,16 @@ Fedoraなど各環境でコンパイルと日本語を通したselectorのチェ
 
 端末のサイズを変えたときに画面が乱れる mfiler4
 
-Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7f95128197d0
-    Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7f951292dbb0
+block -runがrun_functionになっているのはおかしい
 
+引数のブロックを格納する変数 BLOCKS
 
-    Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7ff502820bb0
-        Detected!! at file: src/block.c line:919 function:expand_env_to_command() addr:7ff502806d50
+ヘルプの整理
+
+xyzshのソースの整理
+
+ASSERTマクロをもっと使う
+
+エラー出力のリダイレクト %2>
+
+変数に新規オブジェクトの作成機能はあるが代入の機能がない。

--- a/configure
+++ b/configure
@@ -3024,7 +3024,7 @@ fi
 #####################################################################
 # check operating systems
 #####################################################################
-SO_VERSION=1.5.5
+SO_VERSION=1.5.8
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Operating System" >&5
 $as_echo_n "checking Operating System... " >&6; }

--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ AC_SUBST(SYSTEM_MIGEMODIR)
 #####################################################################
 # check operating systems
 #####################################################################
-SO_VERSION=1.5.6
+SO_VERSION=1.5.8
 AC_SUBST(SO_VERSION)
 AC_MSG_CHECKING(Operating System)
 

--- a/help.xyzsh
+++ b/help.xyzsh
@@ -542,6 +542,22 @@ def 関数名（ブロック）
 aaa
 -def
 bbb
+-copy-stackframe スタックフレーム（ローカル変数の入れ物)を新しく作る際に現在のスタックフレームの内容をコピーします。
+(例)
+> vim a.xyzsh
+def times -copy-stackframe ( 
+    print 0 | var -local _i
+    while(_i | -lt $ARGV[0]) (
+       | eval $(block)
+       ++ _i
+    )
+)
+> load a.xyzsh; print Hello | var -local a; times 3 ( a )
+Hello
+Hello
+Hello
+
+このオプションがないとtimes 3 ( a ) でaが見つからないエラーが出る。
 -
 class クラス名（ブロック）
 -
@@ -555,6 +571,22 @@ class クラス名（ブロック）
 aaa
 -def
 bbb
+-copy-stackframe スタックフレーム（ローカル変数の入れ物)を新しく作る際に現在のスタックフレームの内容をコピーします。
+(例)
+> vim a.xyzsh
+class times -copy-stackframe ( 
+    print 0 | var -local _i
+    while(_i | -lt $ARGV[0]) (
+       | eval $(block)
+       ++ _i
+    )
+)
+> load a.xyzsh; print Hello | var -local a; times 3 ( a )
+Hello
+Hello
+Hello
+
+このオプションがないとtimes 3 ( a ) でaが見つからないエラーが出る。
 -
 inherit 引数|オプション|ブロック
 -
@@ -1410,6 +1442,22 @@ If you omit the block, output the function source.
 aaa
 -def
 bbb
+-copy-stackframe When making new stackframe, xyzsh copys variables in old stackframe to new one.
+(ex)
+> vim a.xyzsh
+class times -copy-stackframe ( 
+    print 0 | var -local _i
+    while(_i | -lt $ARGV[0]) (
+       | eval $(block)
+       ++ _i
+    )
+)
+> load a.xyzsh; print Hello | var -local a; times 3 ( a )
+Hello
+Hello
+Hello
+
+If there is not -copy-stackframe option, xyzsh raises an error which is "not found a variable" on "times 3 ( a )" code.
 -
 class (class name) (block)
 -

--- a/src/block.c
+++ b/src/block.c
@@ -750,9 +750,9 @@ void block_delete_stack(sObject* self)
     if(SBLOCK(self).mSource) FREE(SBLOCK(self).mSource);
 }
 
-//////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 // some functions
-/////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 void block_view(sObject* self)
 {
     printf("mStatmentsNum %d\n", SBLOCK(self).mStatmentsNum);

--- a/src/class.c
+++ b/src/class.c
@@ -13,7 +13,7 @@ static int options_hash_fun(char* key)
     return value % XYZSH_OPTION_MAX;
 }
 
-sObject* class_new_from_gc(sObject* parent, BOOL user_object)
+sObject* class_new_from_gc(sObject* parent, BOOL user_object, BOOL no_stackframe)
 {
    sObject* self = gc_get_free_object(T_CLASS, user_object);
    
@@ -26,11 +26,13 @@ sObject* class_new_from_gc(sObject* parent, BOOL user_object)
    SCLASS(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SCLASS(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SCLASS(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
+
    return self;
 }
 
 
-sObject* class_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObject* parent)
+sObject* class_clone_from_stack_block_to_gc(sObject* block, BOOL user_object, sObject* parent, BOOL no_stackframe)
 {
    sObject* self = gc_get_free_object(T_CLASS, user_object);
    
@@ -42,11 +44,12 @@ sObject* class_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObje
    SCLASS(self).mArgBlocks = NULL;
    SCLASS(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SCLASS(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
+   SCLASS(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
 
    return self;
 }
 
-sObject* class_clone_from_stack_block_stack(sObject* block, sObject* parent)
+sObject* class_clone_from_stack_block_to_stack(sObject* block, sObject* parent, BOOL no_stackframe)
 {
    sObject* self = stack_get_free_object(T_CLASS);
    
@@ -59,6 +62,8 @@ sObject* class_clone_from_stack_block_stack(sObject* block, sObject* parent)
    SCLASS(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SCLASS(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SCLASS(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
+
    return self;
 }
 

--- a/src/cmd_base.c
+++ b/src/cmd_base.c
@@ -352,7 +352,6 @@ BOOL cmd_raise(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     return TRUE;
 }
 
-
 BOOL cmd_sweep(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 {
     sCommand* command = runinfo->mCommand;
@@ -853,13 +852,15 @@ BOOL cmd_block(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 
         if(SFUN(fun).mArgBlocks && block_num < vector_count(SFUN(fun).mArgBlocks)) {
             sObject* block = vector_item(SFUN(fun).mArgBlocks, block_num);
-            sObject* fun = fun_clone_from_stack_block_stack(block, NULL);
 
-            if(!run_function(fun, nextin, nextout, runinfo, command->mArgsRuntime + 2, command->mArgsNumRuntime -2, command->mBlocks, command->mBlocksNum))
+            int rcode = 0;
+            if(!run(block, nextin, nextout, &rcode, runinfo->mCurrentObject, runinfo->mRunningObject)) 
             {
+                sCommand* command = runinfo->mCommand;
+                err_msg_adding("run time error", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                runinfo->mRCode = rcode;
                 return FALSE;
             }
-            //runinfo->mRCode = runinfo->mRCode;
         }
     }
     else {

--- a/src/cmd_obj.c
+++ b/src/cmd_obj.c
@@ -58,10 +58,12 @@ static BOOL entry_fun(sObject* nextin, sObject* nextout, sRunInfo* runinfo, sObj
     sObject* object = runinfo->mCurrentObject;
     sCommand* command = runinfo->mCommand;
 
+    BOOL no_stackframe = sCommand_option_item(command, "-copy-stackframe");
+
     if(type == T_CLASS) 
-        block = class_clone_from_stack_block_gc(block, TRUE, NULL); // block is a stack object, so change the memory manager from stack to gc
+        block = class_clone_from_stack_block_to_gc(block, TRUE, NULL, no_stackframe); // block is a stack object, so change the memory manager from stack to gc
     else
-        block = fun_clone_from_stack_block_gc(block, TRUE, NULL); // block is a stack object, so change the memory manager from stack to gc
+        block = fun_clone_from_stack_block_to_gc(block, TRUE, NULL, no_stackframe); // block is a stack object, so change the memory manager from stack to gc
 
     if(sCommand_option_item(command, "-inherit")) {
         sObject* parent = uobject_item(object, command->mArgsRuntime[1]);
@@ -1209,7 +1211,7 @@ BOOL cmd_mrun(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
     sCommand* command = runinfo->mCommand;
 
     if(command->mBlocksNum == 1) {
-        sObject* klass = class_clone_from_stack_block_stack(command->mBlocks[0], NULL);
+        sObject* klass = class_clone_from_stack_block_to_stack(command->mBlocks[0], NULL, sCommand_option_item(command, "-copy-stackframe"));
 
         int rcode = 0;
         if(!run(SCLASS(klass).mBlock, nextin, nextout, &rcode, runinfo->mRecieverObject, runinfo->mRunningObject)) {

--- a/src/fun.c
+++ b/src/fun.c
@@ -13,7 +13,7 @@ static int options_hash_fun(char* key)
     return value % XYZSH_OPTION_MAX;
 }
 
-sObject* fun_new_from_gc(sObject* parent, BOOL user_object)
+sObject* fun_new_from_gc(sObject* parent, BOOL user_object, BOOL no_stackframe)
 {
    sObject* self = gc_get_free_object(T_FUN, user_object);
    
@@ -29,6 +29,8 @@ sObject* fun_new_from_gc(sObject* parent, BOOL user_object)
    SFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SFUN(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SFUN(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
+
    return self;
 }
 
@@ -47,10 +49,12 @@ sObject* fun_new_from_stack(sObject* parent)
    SFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SFUN(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SFUN(self).mFlags = 0;
+
    return self;
 }
 
-sObject* fun_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObject* parent)
+sObject* fun_clone_from_stack_block_to_gc(sObject* block, BOOL user_object, sObject* parent, BOOL no_stackframe)
 {
    sObject* self = gc_get_free_object(T_FUN, user_object);
    
@@ -65,10 +69,12 @@ sObject* fun_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObject
    SFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SFUN(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SFUN(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
+
    return self;
 }
 
-sObject* fun_clone_from_stack_block_stack(sObject* block, sObject* parent)
+sObject* fun_clone_from_stack_block_to_stack(sObject* block, sObject* parent, BOOL no_stackframe)
 {
    sObject* self = stack_get_free_object(T_FUN);
    
@@ -83,6 +89,8 @@ sObject* fun_clone_from_stack_block_stack(sObject* block, sObject* parent)
    SFUN(self).mOptions = MALLOC(sizeof(option_hash_it)*XYZSH_OPTION_MAX);
    memset(SFUN(self).mOptions, 0, sizeof(option_hash_it)*XYZSH_OPTION_MAX);
 
+   SFUN(self).mFlags = no_stackframe ? FUN_FLAGS_NO_STACKFRAME : 0;
+
    return self;
 }
 

--- a/src/hash.c
+++ b/src/hash.c
@@ -418,7 +418,7 @@ int hash_gc_children_mark(sObject* self)
     while(it) {
         sObject* item = it->mItem;
 
-        if((item->mFlg & GC_MARK) == 0) {
+        if(item && (item->mFlg & GC_MARK) == 0) {
             item->mFlg |= GC_MARK;
             count++;
             count += object_gc_children_mark(item);

--- a/src/list.c
+++ b/src/list.c
@@ -301,7 +301,7 @@ int list_gc_children_mark(sObject* self)
     for(it= SLIST(self).mEntryIt; it; it=it->mNextIt) {
         sObject* item = it->mItem;
 
-        if((item->mFlg & GC_MARK) == 0) {
+        if(item && (item->mFlg & GC_MARK) == 0) {
             item->mFlg |= GC_MARK;
             count ++;
             count += object_gc_children_mark(item);

--- a/src/run.c
+++ b/src/run.c
@@ -581,10 +581,28 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
     sRunInfo* runinfo2 = SFUN(fun).mRunInfo;
     SFUN(fun).mRunInfo = runinfo;
 
-    sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
-    vector_add(gStackFrames, stackframe);
-    //uobject_init(stackframe);
-    SFUN(fun).mLocalObjects = stackframe;
+    BOOL no_stackframe = SFUN(fun).mFlags & FUN_FLAGS_NO_STACKFRAME;
+
+    if(!no_stackframe) {
+        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
+        vector_add(gStackFrames, stackframe);
+        //uobject_init(stackframe);
+        SFUN(fun).mLocalObjects = stackframe;
+    } else {
+        sObject* stackframe_before = vector_item(gStackFrames, vector_count(gStackFrames)-1);
+        sObject* stackframe = UOBJECT_NEW_GC(8, gXyzshObject, "_stackframe", FALSE);
+        vector_add(gStackFrames, stackframe);
+        //uobject_init(stackframe);
+        SFUN(fun).mLocalObjects = stackframe;
+
+        uobject_it* it = uobject_loop_begin(stackframe_before);
+        while(it) {
+             sObject* object = uobject_loop_item(it);
+             char* key = uobject_loop_key(it);
+             uobject_put(stackframe, key, object);
+             it = uobject_loop_next(it);
+        }
+    }
 
     sObject* argv2 = VECTOR_NEW_GC(16, FALSE);
     int i;
@@ -631,7 +649,7 @@ BOOL run_function(sObject* fun, sObject* nextin, sObject* nextout, sRunInfo* run
 
     (void)vector_pop_back(gStackFrames);
 
-runinfo->mRCode = rcode;
+    runinfo->mRCode = rcode;
 
     SFUN(fun).mLocalObjects = local_objects;
     SFUN(fun).mArgBlocks = arg_blocks;
@@ -688,7 +706,7 @@ static BOOL run_object(sObject* object, sObject* nextin, sObject* nextout, sRunI
 
         case T_CLASS: {
             sCommand* command = runinfo->mCommand;
-            if(!run_function(object, nextin, nextout, runinfo, command->mArgsRuntime + 1, command->mArgsNumRuntime -1, command->mBlocks, command->mBlocksNum)){
+            if(!run_function(object, nextin, nextout, runinfo, command->mArgsRuntime + 1, command->mArgsNumRuntime -1, command->mBlocks, command->mBlocksNum)) {
                 return FALSE;
             }
             }

--- a/src/uobject.c
+++ b/src/uobject.c
@@ -326,7 +326,7 @@ int uobject_gc_children_mark(sObject* self)
     while(it) {
         sObject* item = it->mItem;
 
-        if((item->mFlg & GC_MARK) == 0) {
+        if(item && (item->mFlg & GC_MARK) == 0) {
             item->mFlg |= GC_MARK;
             count++;
 

--- a/src/vector.c
+++ b/src/vector.c
@@ -231,7 +231,7 @@ int vector_gc_children_mark(sObject* self)
     for(i=0; i<SVECTOR(self).mCount; i++) {
         sObject* item = SVECTOR(self).mTable[i];
 
-        if((item->mFlg & GC_MARK) == 0) {
+        if(item && (item->mFlg & GC_MARK) == 0) {
             item->mFlg |= GC_MARK;
             count++;
 

--- a/src/xyzsh.c
+++ b/src/xyzsh.c
@@ -85,7 +85,7 @@ static void xyzsh_read_rc()
 
 void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 {
-    setenv("XYZSH_VERSION", "1.2.8", 1);
+    setenv("XYZSH_VERSION", "1.2.9", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     setlocale(LC_ALL, "");

--- a/src/xyzsh/block.h
+++ b/src/xyzsh/block.h
@@ -25,13 +25,11 @@ void sCommand_add_env_block(sCommand* self, sObject* block, BOOL double_dollar,
 void sCommand_add_env(sCommand* self, MANAGED char* name, MANAGED char* key, BOOL key_env, BOOL double_dollar);
 void sCommand_add_redirect_to_command(sCommand* self, MANAGED char* name, BOOL env, BOOL glob, int redirect);
 
-sObject* fun_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObject* parent);
-sObject* fun_clone_from_stack_block_stack(sObject* block, sObject* parent);
+sObject* fun_clone_from_stack_block_to_gc(sObject* block, BOOL user_object, sObject* parent, BOOL no_stackframe);
+sObject* fun_clone_from_stack_block_to_stack(sObject* block, sObject* parent, BOOL no_stackframe);
 
-sObject* make_stack_fun_from_stack_block(sObject* self);
-
-sObject* class_clone_from_stack_block_gc(sObject* block, BOOL user_object, sObject* parent);
-sObject* class_clone_from_stack_block_stack(sObject* block, sObject* parent);
+sObject* class_clone_from_stack_block_to_gc(sObject* block, BOOL user_object, sObject* parent, BOOL no_stackframe);
+sObject* class_clone_from_stack_block_to_stack(sObject* block, sObject* parent, BOOL no_stackframe);
 
 #endif
 

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -276,6 +276,8 @@ struct block_obj
 struct _sObject;
 struct _sRunInfo;
 
+#define FUN_FLAGS_NO_STACKFRAME 0x01
+
 typedef struct
 {
     struct _sObject* mBlock;
@@ -287,6 +289,8 @@ typedef struct
 
     option_hash_it* mOptions;
     struct _sRunInfo* mRunInfo;
+
+    char mFlags;
 } fun_obj;
 
 typedef fun_obj class_obj;
@@ -498,8 +502,8 @@ void nfun_delete_gc(sObject* self);
 BOOL nfun_put_option_with_argument(sObject* self, MANAGED char* key);
 BOOL nfun_option_with_argument_item(sObject* self, char* key);
 
-sObject* fun_new_from_gc(sObject* parent, BOOL user_object);
-#define FUN_NEW_GC(o, o2) fun_new_from_gc(o, o2)
+sObject* fun_new_from_gc(sObject* parent, BOOL user_object, BOOL no_stackframe);
+#define FUN_NEW_GC(o, o2, o3) fun_new_from_gc(o, o2, o3)
 void fun_delete_gc(sObject* self);
 int fun_gc_children_mark(sObject* self);
 #define FUN_NEW_STACK(o) fun_new_from_stack(o)
@@ -508,8 +512,8 @@ void fun_delete_stack(sObject* self);
 BOOL fun_put_option_with_argument(sObject* self, MANAGED char* key);
 BOOL fun_option_with_argument_item(sObject* self, char* key);
 
-sObject* class_new_from_gc(sObject* parent, BOOL user_object);
-#define CLASS_NEW_GC(o, o2) class_fun_new_from_gc(o, o2)
+sObject* class_new_from_gc(sObject* parent, BOOL user_object, BOOL no_stackframe);
+#define CLASS_NEW_GC(o, o2, o3) class_fun_new_from_gc(o, o2, o3)
 void class_delete_gc(sObject* self);
 void class_delete_stack(sObject* self);
 BOOL class_option_with_argument_item(sObject* self, char* key);

--- a/xyzsh.xyzsh
+++ b/xyzsh.xyzsh
@@ -80,11 +80,11 @@ EOS > ~/.xyzsh/macro
     )
 )
 
-def times ( 
-    print 0 | var -local i
-    while(i | -lt $ARGV[0]) (
+def times -copy-stackframe ( 
+    print 0 | var -local _i
+    while(_i | -lt $ARGV[0]) (
        | eval $(block)
-       ++ i
+       ++ _i
     )
 )