提交: 63acfe8dce71092121ca1ab96da222d177889fa1 - xyzsh (git)

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

Commit MetaInfo

• 修订版: 63acfe8dce71092121ca1ab96da222d177889fa1 (tree)
• 时间: 2012-11-02 22:09:01
• 作者: ab25cq <ab25cq@gmai...>
• Commiter: ab25cq

Log Message

v1.1.8 release

更改概述

• modified: CHANGELOG
• modified: README
• modified: USAGE
• modified: USAGE.ja
• modified: help.xyzsh
• modified: src/cmd_str.c
• modified: src/uobject.c
• modified: src/xyzsh.c
• modified: xyzsh.xyzsh

差异

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,11 @@
 
+2012 30th Octorber version 1.1.8
+
+	Added -index option to "add" inner command and "del" inner command.
+
+	Added ~/.xyzsh/program mechanizm to entry external program for root
+	object. See USAGE or USAGE.ja
+
 2012 30th Octorber version 1.1.7a
 
 	Deleted castamized code for CYGWIN. It has not been required.

--- a/README
+++ b/README
@@ -100,6 +100,7 @@ Used files
     ~/.xyzsh/macro --> macro which is runned by typing C-x on command line uses this file
     ~/.xyzsh/jump --> jump inner command uses this file
     ~/.xyzsh/menu --> menu inner command uses this file
+    ~/.xyzsh/program --> program list which is entried to root object
 
 Encoding and Line field
     xyzsh script source file must be written with UTF-8 encode and LF Linefield. But, xyzsh can treat UTF8, EUCJP, and SJIS encodings and can treat LF, CR, LFCR line fields. (EUCJP and SJIS are for Japanese)

--- a/USAGE
+++ b/USAGE
@@ -493,17 +493,15 @@
 
     However, fulequently used commands are entried on root object with refference.
 
-    --- xyzsh.xyzsh ---
-
-    print "cat ls pwd cp mv rm rmdir ln make vi vim perl ruby python sed awk grep egrep find less wc sudo echo which whoami head tail" | split | each (
-        | chomp | var -local prog
-
-        try ( sys::run ( root::ref $prog )  | ref $prog) catch ()
-    )
-
     So you can use ls without sys::
 
     > ls
+
+    If you want to entry new external program for root object, you may add new program name to ~/.xyzsh/program like below and run rehash inner command.
+
+    > print dmesg\n >> ~/.xyzsh/program
+    > rehash
+    > dmesg
    
 
 2.4 subshell

--- a/USAGE.ja
+++ b/USAGE.ja
@@ -507,24 +507,22 @@
 
 2.3 外部コマンド
 
-    外部コマンドは起動時にrehashされてsysオブジェクトの中に外部コマンドオブジェクトとして入れられます。
+    外部コマンドは起動時にrehashされてeysオブジェクトの中に外部コマンドオブジェクトとして入れられます。
     rehash内部コマンドが実行されるたびにsysオブジェクトの中に新しく作られます。
 
     > sys::dmesg    # dmesg外部コマンドを実行
 
     ただし、lsなど使用頻度が高いコマンドについてはリファレンスによってルートオブジェクトに登録されています。
 
-    --- xyzsh.xyzsh より ---
-
-    print "cat ls pwd cp mv rm rmdir ln make vi vim perl ruby python sed awk grep egrep find less wc sudo echo which whoami head tail" | split | each (
-        | chomp | var -local prog
-
-        try ( sys::run ( root::ref $prog )  | ref $prog) catch ()
-    )
-
     よってlsなどはsys::を付けなくても実行できます。
 
     > ls    # sys::lsでなくても良い
+
+    sys::を省略したい外部プログラムを追加するには~/.xyzsh/programにあるプログラム一覧にプログラム名を追加してください。その後rehashをすると追加されます。
+
+    > print dmesg\n >> ~/.xyzsh/program
+    > rehash
+    > dmesg
    
 
 2.4 サブシェル

--- a/help.xyzsh
+++ b/help.xyzsh
@@ -844,6 +844,7 @@ add 文字列
 -
 文字列をパイプに追加するフィルター。
 
+-index 数値 数値の位置に文字列を追加する
 -number 数値 数値の位置に文字列を追加する
 -byte バイトコードとして処理する
 -utf8 UTF8コードとして処理する
@@ -854,6 +855,7 @@ del インデックス
 -
 パイプの中のインデックスの位置の文字を一文字削除して残りを出力するフィルター。
 
+-index 文字数 文字数分削除する
 -number 文字数 文字数分削除する
 -byte バイトコードとして処理する
 -utf8 UTF8コードとして処理する
@@ -1677,6 +1679,7 @@ add (string)
 -
 It is a filter for adding string to pipe data.
 
+-index (number) add the string at the number position.
 -number (number) add the string at the number position.
 -byte assume text encode as byte code.
 -utf8 assume text encode as utf-8 code.
@@ -1687,6 +1690,7 @@ del (index)
 -
 It is a filter for removing a character on pipe data.
 
+-index (number) Number characters are removed.
 -number (number) Number characters are removed.
 -byte assume text encode as byte code.
 -utf8 assume text encode as utf-8 code.

--- a/src/cmd_str.c
+++ b/src/cmd_str.c
@@ -1875,6 +1875,9 @@ BOOL cmd_add(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         if(argument = sCommand_option_with_argument_item(command, "-number")) {
             number = atoi(argument);
         }
+        else if(argument = sCommand_option_with_argument_item(command, "-index")) {
+            number = atoi(argument);
+        }
         else {
             number = -1;
         }
@@ -1956,6 +1959,9 @@ BOOL cmd_del(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
         if(argument = sCommand_option_with_argument_item(command, "-number")) {
             number = atoi(argument);
         }
+        else if(argument = sCommand_option_with_argument_item(command, "-index")) {
+            number = atoi(argument);
+        }
         else {
             number = 1;
         }

--- a/src/uobject.c
+++ b/src/uobject.c
@@ -240,10 +240,12 @@ void uobject_root_init(sObject* self)
 
     nfun = NFUN_NEW_GC(cmd_add, NULL, TRUE);
     (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
     uobject_put(self, "add", nfun);
 
     nfun = NFUN_NEW_GC(cmd_del, NULL, TRUE);
     (void)nfun_put_option_with_argument(nfun, STRDUP("-number"));
+    (void)nfun_put_option_with_argument(nfun, STRDUP("-index"));
     uobject_put(self, "del", nfun);
 
     nfun = NFUN_NEW_GC(cmd_index, NULL, TRUE);

--- a/src/xyzsh.c
+++ b/src/xyzsh.c
@@ -112,7 +112,7 @@ static void xyzsh_read_rc()
 
 void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script)
 {
-    setenv("XYZSH_VERSION", "1.1.7a", 1);
+    setenv("XYZSH_VERSION", "1.1.8", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;

--- a/xyzsh.xyzsh
+++ b/xyzsh.xyzsh
@@ -15,12 +15,26 @@ print ~/.xyzsh | if(| -e) (
 print 1000 | export XYZSH_HISTSIZE
 print ~/.xyzsh/history | export XYZSH_HISTFILE
 
-print "tee find unzip diff seq env sleep ps kill killall pkill autoconf automake od nm gcc uname chgrp chmod chown sed awk make git ssh scp tar sudo gzip bash cat ls pwd cp mv rm rmdir ln vi vim grep egrep find less wc echo which whoami head tail uniq mkdir touch man" | split | each (
+print ~/.xyzsh/program | if(! | -e) (
+    print "tee find unzip diff seq env sleep ps kill killall pkill autoconf automake od nm gcc uname chgrp chmod chown sed awk make git ssh scp tar sudo gzip bash cat ls pwd cp mv rm rmdir ln vi vim grep egrep find less wc echo which whoami head tail uniq mkdir touch man" | split > ~/.xyzsh/program
+)
+
+sys::cat ~/.xyzsh/program | each (
     | chomp | var -local prog
 
     try ( sys::run ( root::ref $prog )  | ref $prog) catch ()
 )
 
+def rehash -inherit (
+    inherit
+
+    sys::cat ~/.xyzsh/program | each (
+        | chomp | var -local prog
+
+        try ( sys::run ( root::ref $prog )  | ref $prog) catch ()
+    )
+)
+
 prompt ( pwd | chomp | add " > " )
 
 def jump (
@@ -40,6 +54,7 @@ def menu (
 vim ~/.xyzsh/menu
 vim ~/.xyzsh/macro
 vim ~/.xyzsh/jump
+vim ~/.xyzsh/program
 ls -al | uc| less
 pwd | scan . | less
 ls | each ( if(|chomp | -d) ( | print ) )