提交: 7945bde3b31e90d7d14a38ae8b70f4c90dae8ba5 - xyzsh (git)

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

Commit MetaInfo

• 修订版: 7945bde3b31e90d7d14a38ae8b70f4c90dae8ba5 (tree)
• 时间: 2012-10-28 00:25:08
• 作者: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Log Message

v1.1.2 release

更改概述

• modified: CHANGELOG
• modified: completion.xyzsh
• modified: src/readline.c
• modified: src/xyzsh.c

差异

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
 
+2012 28th Octorber version 1.1.2
+
+    add function with running completion block to "completion" inner command.
+    fixed sudo completion. you can use completion to type after sudo.
+
 2012 18th Octorber version 1.1.1
 
     add "defined" inner command. see help

--- a/completion.xyzsh
+++ b/completion.xyzsh
@@ -99,15 +99,16 @@ completion man (
     program_completion
 )
 
-def get_input_num (
-    | split '(?<!\\) +' | wc -l
-)
-
 completion sudo (
-    | scan 'sudo .*' | chomp| get_input_num | var -local input_num
+    | scan 'sudo .*' | chomp | split '(?<!\\) +' | wc -l | var -local input_num
+    | scan 'sudo .*' | chomp | split '(?<!\\) +' | lines 1 (|print) | var -local program_name
 
     if(input_num | -eq 2) (
         program_completion
+    ) elif(input_num | -ge 3 && program_name |chomp| != sudo) (
+        try (
+            completion $program_name
+        ) catch ()
     )
 )
 

--- a/src/readline.c
+++ b/src/readline.c
@@ -632,52 +632,131 @@ BOOL cmd_completion(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
 {
     sCommand* command = runinfo->mCommand;
 
-    if(command->mArgsNumRuntime >= 2 && command->mBlocksNum == 1) {
-        sObject* block = command->mBlocks[0];
+    if(command->mArgsNumRuntime >= 2) {
+        if(command->mBlocksNum == 1) {
+            sObject* block = command->mBlocks[0];
 
-        int i;
-        for(i=1; i<command->mArgsNumRuntime; i++) {
-            sObject* object = gCompletionObject;
-
-            sObject* str = STRING_NEW_GC("", FALSE);
-            char* p = command->mArgsRuntime[i];
-            while(*p) {
-                if(*p == ':' && *(p+1) == ':') {
-                    if(string_c_str(str)[0] == 0) {
-                        err_msg("invalid object name", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
-                        return FALSE;
-                    }
-                    p+=2;
+            int i;
+            for(i=1; i<command->mArgsNumRuntime; i++) {
+                sObject* object = gCompletionObject;
+
+                sObject* str = STRING_NEW_GC("", FALSE);
+                char* p = command->mArgsRuntime[i];
+                while(*p) {
+                    if(*p == ':' && *(p+1) == ':') {
+                        if(string_c_str(str)[0] == 0) {
+                            err_msg("invalid object name", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                            return FALSE;
+                        }
+                        p+=2;
 
-                    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);
-                        uobject_put(object, string_c_str(str), new_object);
-                        uobject_init(new_object);
+                        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);
+                            uobject_put(object, string_c_str(str), new_object);
+                            uobject_init(new_object);
 
-                        object = new_object;
+                            object = new_object;
+                        }
+                        else {
+                            object = object2;
+                        }
+                        string_put(str, "");
                     }
                     else {
-                        object = object2;
+                        string_push_back2(str, *p);
+                        p++;
                     }
-                    string_put(str, "");
+                }
+                if(object && TYPE(object) == T_UOBJECT && string_c_str(str)[0] != 0) {
+                    uobject_put(object, string_c_str(str), COMPLETION_NEW_GC(block, FALSE));
                 }
                 else {
-                    string_push_back2(str, *p);
-                    p++;
+                    err_msg("There is no object", runinfo->mSName, runinfo->mSLine, command->mArgsRuntime[i]);
+
+                    return FALSE;
                 }
             }
-            if(object && TYPE(object) == T_UOBJECT && string_c_str(str)[0] != 0) {
-                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]);
 
-                return FALSE;
-            }
+            runinfo->mRCode = 0;
         }
+        else if(command->mBlocksNum == 0) {
+            int i;
+            for(i=1; i<command->mArgsNumRuntime; i++) {
+                sObject* object = gCompletionObject;
+
+                sObject* str = STRING_NEW_GC("", FALSE);
+                char* p = command->mArgsRuntime[i];
+                while(*p) {
+                    if(*p == ':' && *(p+1) == ':') {
+                        if(string_c_str(str)[0] == 0) {
+                            err_msg("invalid object name", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                            return FALSE;
+                        }
+                        p+=2;
 
-        runinfo->mRCode = 0;
+                        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);
+                            uobject_put(object, string_c_str(str), new_object);
+                            uobject_init(new_object);
+
+                            object = new_object;
+                        }
+                        else {
+                            object = object2;
+                        }
+                        string_put(str, "");
+                    }
+                    else {
+                        string_push_back2(str, *p);
+                        p++;
+                    }
+                }
+                if(object && TYPE(object) == T_UOBJECT && string_c_str(str)[0] != 0) {
+                    sObject* completion = uobject_item(object, string_c_str(str));
+                    if(completion) {
+                        stack_start_stack();
+
+                        sObject* fun = FUN_NEW_STACK(NULL);
+                        sObject* stackframe = UOBJECT_NEW_GC(8, gxyzshObject, "_stackframe", FALSE);
+                        vector_add(gStackFrames, stackframe);
+                        //uobject_init(stackframe);
+                        SFUN(fun).mLocalObjects = stackframe;
+
+                        xyzsh_set_signal();
+                        int rcode = 0;
+                        if(!run(SCOMPLETION(completion).mBlock, nextin, nextout, &rcode, gRootObject, fun)) {
+                            if(rcode == RCODE_BREAK) {
+                            }
+                            else if(rcode == RCODE_RETURN) {
+                            }
+                            else if(rcode == RCODE_EXIT) {
+                            }
+                            else {
+                                fprintf(stderr, "run time error\n");
+                                fprintf(stderr, "%s", string_c_str(gErrMsg));
+                            }
+                        }
+                        (void)vector_pop_back(gStackFrames);
+                        readline_signal();
+                        stack_end_stack();
+                    }
+                    else {
+                        err_msg("There is no object", runinfo->mSName, runinfo->mSLine, command->mArgsRuntime[i]);
+
+                        return FALSE;
+                    }
+                }
+                else {
+                    err_msg("There is no object", runinfo->mSName, runinfo->mSLine, command->mArgsRuntime[i]);
+
+                    return FALSE;
+                }
+            }
+
+            runinfo->mRCode = 0;
+        }
     }
 
     return 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.1", 1);
+    setenv("XYZSH_VERSION", "1.1.2", 1);
     setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1);
 
     stack_init(1);;