コミット: e6937031845487331f4725d07d3efa18e748b1ad - xyzsh (git)

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

コミットメタ情報

• リビジョン: e6937031845487331f4725d07d3efa18e748b1ad (tree)
• 日時: 2013-02-04 18:12:09
• 作者: ab25cq <ab25cq@gmai...>
• コミッター: ab25cq

ログメッセージ

1.3.4

変更サマリ

• modified: CHANGELOG
• modified: completion.xyzsh
• modified: help.xyzsh
• modified: src/ext/migemo.dll.xyzsh
• modified: src/ext/migemo.so.xyzsh
• modified: src/readline.c

差分

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 
+2013 3rd Feburary version 1.3.4
+
+    1. Added "-source" option to "completion" inner command.
+
+    2. Added file name completion to "cd" inner command.
+
 2013 3rd Feburary version 1.3.3
 
     1. Modified configure.in and Makfile.in especially for related with docdir and sysconfdir

--- a/completion.xyzsh
+++ b/completion.xyzsh
@@ -209,3 +209,18 @@ completion rl::help (
     rl::self | egrep native\ function\$ | egrep -v 'run|show' | root::scan '(^.+?):' | each ( | chomp | quote | pomch )
 )
 
+completion cd (
+    | file_completion
+    hash COMPLETION_OPTIONS -key cd
+)
+
+completion __all__ (
+    | file_completion
+)
+
+root::compl::run( root::object sys )
+
+completion sys::__all__ (
+    | file_completion
+)
+

--- a/help.xyzsh
+++ b/help.xyzsh
@@ -967,8 +967,10 @@ completion (オブジェクト::)コマンド名 (ブロック)
 root::complにオブジェクトとして登録される
 ARGVにはコマンド名と入力中の文字列が入っている
 コンテキストパイプには入力中の行が入っている
-コマンド名に*を使うとコマンド名が見つからなかった時は*が使われる
+コマンド名に__all__を使うとコマンド名が見つからなかった時は__all__が使われる
 ブロックが無かった場合は定義された補完を実行して結果を返す。
+
+-source ソースを表示する
 -
 help コマンド名
 -
@@ -1865,8 +1867,10 @@ completion (object name::)(command name) (block)
 If there is a block, define the user completion in root::compl. Output of block is candidates for completion.
 ARGV has a command name and an inputing string.
 Context pipe has all inputing line.
-If you use * for command name, it is wild card.
+If you use __all__ for command name, it is wild card.
 If there is not a block, run the completion and return output.
+
+-source output a source program of completion
 -
 help (command name)
 -
@@ -1942,6 +1946,10 @@ write_history (file name)
 read_history (file name)
 -
 ヒストリをファイルから読み出す
+-
+file_name_completion_null_generator
+-
+readlineの補完で補完がない場合にデフォルトの補完を使わないようにする
 EOS | help::set_helps_ja
 
     print <<<'EOS'
@@ -1980,6 +1988,10 @@ write readline cmdline history to a file
 read_history (file name)
 -
 read readline cmdline history to the memory
+-
+file_name_completion_null_generator
+-
+Don't use default readline completion of file name.
 EOS | help::set_helps
 )
 

--- a/src/ext/migemo.dll.xyzsh
+++ b/src/ext/migemo.dll.xyzsh
@@ -1,3 +1,5 @@
+print migemo.dll.xyzsh | p > /dev/null
+
 print "welcome to migemo.so dynamic library. You can read help type with \"migemo::help 'command name'\""\n
 
 compl::run( root::object migemo )

--- a/src/ext/migemo.so.xyzsh
+++ b/src/ext/migemo.so.xyzsh
@@ -149,9 +149,18 @@ root::run(
         )
 
         def file_completion (
+            | chomp | split '(?<!\\) +' | length -line-num | var -local input_num
             | split '(?<!\\) +' | lines -1 | var -local inputing
 
-            if(inputing | index -quiet /) (
+            if(input_num | = 1\n) (
+                ls | each (
+                    | if (|chomp| -d) (
+                        | chomp | xyzsh_quote | add / | pomch
+                    ) else (
+                        |chomp | xyzsh_quote| pomch
+                    )
+                )
+            ) elif (inputing | index -quiet /) (
                 sys::dirname $(inputing|chomp| if (|rows -1 | = /) ( |add aaa ) else ( | print ) ) | var -local DIR
 
                 ls $(DIR|xyzsh_dequote|chomp) | each (

--- a/src/readline.c
+++ b/src/readline.c
@@ -721,26 +721,55 @@ BOOL cmd_completion(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         }
         /// output ///
         else if(runinfo->mBlocksNum == 0) {
-            int i;
-            for(i=1; i<runinfo->mArgsNumRuntime; i++) {
-                sObject* compl;
-                if(!get_object_from_str(&compl, runinfo->mArgsRuntime[i], runinfo->mCurrentObject, runinfo->mRunningObject, runinfo)) {
-                    return FALSE;
-                }
+            if(sRunInfo_option(runinfo, "-source")) {
+                int i;
+                for(i=1; i<runinfo->mArgsNumRuntime; i++) {
+                    sObject* compl;
+                    if(!get_object_from_str(&compl, runinfo->mArgsRuntime[i], runinfo->mCurrentObject, runinfo->mRunningObject, runinfo)) {
+                        return FALSE;
+                    }
+
+                    if(compl && TYPE(compl) == T_COMPLETION) {
+                        sObject* block = SCOMPLETION(compl).mBlock;
+                        if(!fd_write(nextout, SBLOCK(block).mSource, strlen(SBLOCK(block).mSource))) 
+                        {
+                            err_msg("signal interrupt", runinfo->mSName, runinfo->mSLine, runinfo->mArgs[0]);
+                            runinfo->mRCode = RCODE_SIGNAL_INTERRUPT;
+                            return FALSE;
+                        }
+                        
+                    }
+                    else {
+                        err_msg("There is no object", runinfo->mSName, runinfo->mSLine, runinfo->mArgsRuntime[i]);
 
-                if(compl && TYPE(compl) == T_COMPLETION) {
-                    if(!run_object(compl, nextin, nextout, runinfo)) {
                         return FALSE;
                     }
                 }
-                else {
-                    err_msg("There is no object", runinfo->mSName, runinfo->mSLine, runinfo->mArgsRuntime[i]);
 
-                    return FALSE;
-                }
+                runinfo->mRCode = 0;
             }
+            else {
+                int i;
+                for(i=1; i<runinfo->mArgsNumRuntime; i++) {
+                    sObject* compl;
+                    if(!get_object_from_str(&compl, runinfo->mArgsRuntime[i], runinfo->mCurrentObject, runinfo->mRunningObject, runinfo)) {
+                        return FALSE;
+                    }
 
-            runinfo->mRCode = 0;
+                    if(compl && TYPE(compl) == T_COMPLETION) {
+                        if(!run_object(compl, nextin, nextout, runinfo)) {
+                            return FALSE;
+                        }
+                    }
+                    else {
+                        err_msg("There is no object", runinfo->mSName, runinfo->mSLine, runinfo->mArgsRuntime[i]);
+
+                        return FALSE;
+                    }
+                }
+
+                runinfo->mRCode = 0;
+            }
         }
     }
 
@@ -881,6 +910,8 @@ BOOL cmd_readline_file_name_completion_null_generator(sObject* nextin, sObject*
 {
     rl_completion_entry_function = readline_filename_completion_null_generator;
 
+    runinfo->mRCode = 0;
+
     return TRUE;
 }