Commit: ab78e2bcd178d9b394d41f63a4146ff966a562d9 - xyzsh (git)

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

Commit MetaInfo

• Revisão: ab78e2bcd178d9b394d41f63a4146ff966a562d9 (tree)
• Hora: 2013-02-01 13:50:51
• Autor: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Mensagem de Log

1.3.3

Mudança Sumário

• modified: CHANGELOG
• modified: help.xyzsh
• modified: src/ext/migemo.so.xyzsh
• modified: src/readline.c
• modified: src/run.c
• modified: src/uobject.c
• modified: src/xyzsh/xyzsh.h

Diff

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,18 @@
 
     9. Modified completion working especially tilde completion..
 
+    10. Fixed below bug.
+
+    > adfasfa | less
+    no an error occures
+
+    |
+    |
+    v
+
+    > adfastfa | less
+    adfastfa is not found
+
 2013 20th January version 1.3.2
 
     1. Added "strip" and "objinfo" inner command

--- a/help.xyzsh
+++ b/help.xyzsh
@@ -1931,6 +1931,10 @@ insert_text (text)
 -
 コンプレッション時のテキスト挿入。
 -
+forced_update_display
+-
+テキスト削除やテキスト挿入をした後に呼び出すと画面が更新される。
+-
 write_history (file name)
 -
 ヒストリをファイルに書き込む
@@ -1965,6 +1969,10 @@ insert_text (text)
 -
 add string to editing line on completion.
 -
+forced_update_display
+-
+call this after "insert_text" or "delete_text" to update command line.
+-
 write_history (file name)
 -
 write readline cmdline history to a file

--- a/src/ext/migemo.so.xyzsh
+++ b/src/ext/migemo.so.xyzsh
@@ -56,7 +56,7 @@ root::run(
             )
         )
 
-        def is_all_ascii (
+        def ascii_only (
             | length -byte | var -local LEN
 
             LEN | -eq $(| length -utf8)
@@ -66,47 +66,59 @@ root::run(
             print $ARGV[0] | var -local inputing
             print $ARGV[1] | var -local editing_line
 
+            print 1 | var -local ALL_ASCII_ONLY
             | each (
-                if (inputing | =~ '.*\/[a-zA-Z]+$') (
-                    | if(|=~ '.*\/[a-zA-Z]+[^a-zA-z/]+$') (
-                        (inputing; |print) | common_head | var -local same_head
-
-                        same_head | var -local no_migemo_string
-                        inputing | sub -no-regex $same_head '' | var -local migemo_string
-                    ) else (
-                        inputing | sub '(.*\/)[a-zA-Z]+$' '\1' | var -local no_migemo_string
-                        inputing | sub '.*\/([a-zA-Z]+)$' '\1' | var -local migemo_string
+                if(|ascii_only) (
+                    | if(| index $inputing | = 0\n) (
+                        | print
                     )
-                ) elif (inputing | =~ '.*\/[^a-zA-Z]+[a-zA-Z]+$') (
-                    inputing | sub '(.*\/[^a-zA-Z]+)[a-zA-Z]+$' '\1' | var -local no_migemo_string
-                    inputing | sub '.*\/[^a-zA-Z]+([a-zA-Z]+)$' '\1' | var -local migemo_string
-                ) elif (inputing | =~ '[a-zA-Z]+$') (
-                    | if(|=~ '[a-zA-Z]+[^a-zA-z/]+$') (
-                        (inputing; |print) | common_head | var -local same_head
-
-                        same_head | var -local no_migemo_string
-                        inputing | sub -no-regex $same_head '' | var -local migemo_string
+                ) else (
+                    print 0 | var -local ALL_ASCII_ONLY
+
+                    if (inputing | =~ '.*\/[a-zA-Z]+$') (
+                        | if(|=~ '.*\/[a-zA-Z]+[^a-zA-z/]+$') (
+                            (inputing; |print) | common_head | var -local same_head
+
+                            same_head | var -local no_migemo_string
+                            inputing | sub -no-regex $same_head '' | var -local migemo_string
+                        ) else (
+                            inputing | sub '(.*\/)[a-zA-Z]+$' '\1' | var -local no_migemo_string
+                            inputing | sub '.*\/([a-zA-Z]+)$' '\1' | var -local migemo_string
+                        )
+                    ) elif (inputing | =~ '.*\/[^a-zA-Z]+[a-zA-Z]+$') (
+                        inputing | sub '(.*\/[^a-zA-Z]+)[a-zA-Z]+$' '\1' | var -local no_migemo_string
+                        inputing | sub '.*\/[^a-zA-Z]+([a-zA-Z]+)$' '\1' | var -local migemo_string
+                    ) elif (inputing | =~ '[a-zA-Z]+$') (
+                        | if(|=~ '[a-zA-Z]+[^a-zA-z/]+$') (
+                            (inputing; |print) | common_head | var -local same_head
+
+                            same_head | var -local no_migemo_string
+                            inputing | sub -no-regex $same_head '' | var -local migemo_string
+                        ) else (
+                            print "" | var -local no_migemo_string
+                            inputing | var -local migemo_string
+                        )
+                    ) elif (inputing | =~ '[^a-zA-Z]+[a-zA-Z]+$') (
+                        inputing | sub '([^a-zA-Z]+)[a-zA-Z]+$' '\1' | var -local no_migemo_string
+                        inputing | sub '[^a-zA-Z]+([a-zA-Z]+)$' '\1' | var -local migemo_string
                     ) else (
                         print "" | var -local no_migemo_string
-                        inputing | var -local migemo_string
+                        print "" | var -local migemo_string
                     )
-                ) elif (inputing | =~ '[^a-zA-Z]+[a-zA-Z]+$') (
-                    inputing | sub '([^a-zA-Z]+)[a-zA-Z]+$' '\1' | var -local no_migemo_string
-                    inputing | sub '[^a-zA-Z]+([a-zA-Z]+)$' '\1' | var -local migemo_string
-                ) else (
-                    print "" | var -local no_migemo_string
-                    print "" | var -local migemo_string
-                )
 
-                | if(| sub -no-regex $no_migemo_string '' | chomp | migemo::match $migemo_string | lines 0 | = 0\n) (
-                    | print
+                    | if(| sub -no-regex $no_migemo_string '' | chomp | migemo::match $migemo_string | lines 0 | = 0\n) (
+                        | print
+                    )
                 )
             )  | (| common_head | var -local COMMON_HEAD; | length -line-num | var -local NUM)
 
-            if(COMMON_HEAD | chomp | -n && COMMON_HEAD | length | -gt $(inputing | length)) (
+            if(ALL_ASCII_ONLY | = 0\n && COMMON_HEAD | chomp | -n && COMMON_HEAD | length | -gt $(inputing | length)) (
                 rl::delete_text $(editing_line | rindex $inputing) $(rl::point)
-                rl::insert_text $COMMON_HEAD 
-                if(NUM | chomp | -eq 1 && COMMON_HEAD| chomp | rows -1 | != /) ( rl::insert_text " " )
+                if(NUM | chomp | -eq 1 && COMMON_HEAD| chomp | rows -1 | != /) ( 
+                    rl::insert_text $COMMON_HEAD" " 
+                ) else (
+                    rl::insert_text $COMMON_HEAD 
+                )
             ) 
         )
 
@@ -145,7 +157,8 @@ root::run(
         )
     )
 
-    if(MIGEMO_COMPLETION_AUTO_LOAD | = 1\n || readline "Do you want to use migemo completion which is Japanese ROMAJI completion?(y/n)" | chomp |=~ -ignore-case ^y) (
+    if((defined MIGEMO_COMPLETION_AUTO_LOAD && MIGEMO_COMPLETION_AUTO_LOAD | = 1\n) || readline "Do you want to use migemo completion which is Japanese ROMAJI completion?(y/n)" | chomp |=~ -ignore-case ^y) (
         MigemoCompletion
+        print "loaded migemo completion.\n"
     )
 )

--- a/src/readline.c
+++ b/src/readline.c
@@ -792,12 +792,19 @@ BOOL cmd_readline_point_move(sObject* nextin, sObject* nextout, sRunInfo* runinf
     return TRUE;
 }
 
+BOOL cmd_readline_forced_update_display(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
+{
+    puts("");
+    rl_forced_update_display();
+    runinfo->mRCode = 0;
+
+    return TRUE;
+}
+
 BOOL cmd_readline_insert_text(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 {
     if(runinfo->mArgsNumRuntime == 2) {
         (void)rl_insert_text(runinfo->mArgsRuntime[1]);
-        puts("");
-        rl_forced_update_display();
 
         runinfo->mRCode = 0;
     }
@@ -818,8 +825,6 @@ BOOL cmd_readline_delete_text(sObject* nextin, sObject* nextout, sRunInfo* runin
         if(rl_point < 0) {
             rl_point = 0;
         }
-        puts("");
-        rl_forced_update_display();
 
         runinfo->mRCode = 0;
     }

--- a/src/run.c
+++ b/src/run.c
@@ -331,6 +331,24 @@ static BOOL wait_child_program(pid_t pid, pid_t nextin_reader_pid, int nextout2,
 
                 return FALSE;
             }
+            /// exited normally ///
+            else if(WIFEXITED(status)) {
+                /// command not found ///
+                if(WEXITSTATUS(status) == 127) {
+                    if(gAppType == kATConsoleApp) // && nextout2 == 1)
+                    {
+                        if(tcsetpgrp(0, getpgid(0)) < 0) {
+                            perror("tcsetpgrp(xyzsh)");
+                            exit(1);
+                        }
+                    }
+
+                    char buf[BUFSIZ];
+                    snprintf(buf, BUFSIZ, "command not found");
+                    err_msg(buf, runinfo->mSName, runinfo->mSLine, program);
+                    return FALSE;
+                }
+            }
             else if(WIFSIGNALED(status)) {  // a xyzsh external program which is not a last command can't be stopped by CTRL-Z
                 err_msg("signal interrupt8", runinfo->mSName, runinfo->mSLine, program);
 

--- a/src/uobject.c
+++ b/src/uobject.c
@@ -116,6 +116,7 @@ void uobject_root_init(sObject* self)
     uobject_put(self, "rl", readline);
 
     uobject_put(readline, "file_name_completion_null_generator", NFUN_NEW_GC(cmd_readline_file_name_completion_null_generator, NULL, TRUE));
+    uobject_put(readline, "forced_update_display", NFUN_NEW_GC(cmd_readline_forced_update_display, NULL, TRUE));
     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));

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -567,6 +567,7 @@ BOOL cmd_objinfo(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 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_forced_update_display(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_readline_file_name_completion_null_generator(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_readline_replace_line(sObject* nextin, sObject* nextout, sRunInfo* runinfo);
 BOOL cmd_readline_point(sObject* nextin, sObject* nextout, sRunInfo* runinfo);