提交: b2dda1a4320e086b85b3633654b5f34203b686a1 - xyzsh (git)

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

Commit MetaInfo

• 修訂: b2dda1a4320e086b85b3633654b5f34203b686a1 (tree)
• 時間: 2012-10-18 22:00:35
• 作者: ab25q <ab25cq@gmai...>
• Commiter: ab25q

Log Message

v1.0.9b release

Change Summary

• modified: CHANGELOG
• modified: src/block.c
• modified: src/cmd_obj.c
• modified: src/run.c
• modified: src/xyzsh/xyzsh.h
• modified: xyzsh.xyzsh

差異

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,18 @@
 2012 18th Octorber version 1.0.9b
 
     fixed break in while loop bug
+    fixed output pipe bug
+
+    > (print aaa\n; print bbb\n > b; print ccc\n ) > a
+
+    can be worked just as one intended
+
+    > cat a
+    aaa
+    ccc
+
+    > cat b
+    bbb
 
 2012 17th Octorber version 1.0.9a
 

--- a/src/block.c
+++ b/src/block.c
@@ -1269,7 +1269,7 @@ BOOL sCommand_expand_env(sCommand* command, sObject* fun, sObject* nextin, sObje
     return TRUE;
 }
 
-BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sObject* nextout, sRunInfo* runinfo)
+BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo* runinfo)
 {
     if(command->mRedirectsNum > 0) {
         command->mRedirectsFileNamesRuntime = MALLOC(sizeof(char*)*command->mRedirectsNum);

--- a/src/cmd_obj.c
+++ b/src/cmd_obj.c
@@ -66,19 +66,15 @@ static BOOL entry_fun(sObject* nextin, sObject* nextout, sRunInfo* runinfo, sObj
     if(sCommand_option_item(command, "-inherit")) {
         sObject* parent = hash_item(object, command->mArgsRuntime[1]);
         if(parent) {
-/*
-            if(SFUN(parent).mParentCount > XYZSH_INHERIT_MAX) {
-                err_msg("can't inherit a parent function because of a parent function number limit", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
-                return FALSE;
+            if(type == T_FUN && (TYPE(parent) == T_FUN || TYPE(parent) == T_NFUN) 
+                || type == T_CLASS && TYPE(parent) == T_CLASS) 
+            {
+                SFUN(block).mParent = parent;
             }
-*/
-            if(type == T_CLASS && (TYPE(parent) == T_FUN || TYPE(parent) == T_NFUN) || type == T_FUN && TYPE(parent) == T_CLASS) {
+            else {
                 err_msg("can't inherit a parent function beacuse of the different type", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
                 return FALSE;
             }
-
-            SFUN(block).mParent = parent;
-//            SFUN(block).mParentCount = SFUN(parent).mParentCount + 1;
         }
         else {
             err_msg("can't inherit. There is not a parent", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
@@ -467,6 +463,14 @@ BOOL cmd_var(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             int i;
             int max = vector_count(SFD(nextin).fdbuf.mLines);
             for(i=1; i<command->mArgsNumRuntime; i++) {
+                sObject* current = runinfo->mCurrentObject;
+                sObject* tmp = access_object3(command->mArgsRuntime[i], &current);
+
+                if(tmp && !sCommand_option_item(command, "-force")) {
+                    err_msg("can't overwrite other the same name variable. Use -force option", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                    return FALSE;
+                }
+
                 if(i-1 < max) {
                     sObject* new_var = STRING_NEW_GC(vector_item(SFD(nextin).fdbuf.mLines, i-1), TRUE);
                     string_chomp(new_var);
@@ -951,6 +955,15 @@ BOOL cmd_ary(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             int i;
             int max = vector_count(SFD(nextin).fdbuf.mLines);
             sObject* new_ary = VECTOR_NEW_GC(16, TRUE);
+
+            sObject* current = runinfo->mCurrentObject;
+            sObject* tmp = access_object3(command->mArgsRuntime[1], &current);
+
+            if(tmp && !sCommand_option_item(command, "-force")) {
+                err_msg("can't overwrite other the same name variable. Use -force option", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                return FALSE;
+            }
+
             hash_put(object, command->mArgsRuntime[1], new_ary);
             for(i=0; i<max; i++) {
                 sObject* new_var = STRING_NEW_GC(vector_item(SFD(nextin).fdbuf.mLines, i), FALSE);
@@ -1150,6 +1163,15 @@ BOOL cmd_hash(sObject* nextin, sObject* nextout, sRunInfo* runinfo)
             int i;
             int max = vector_count(SFD(nextin).fdbuf.mLines);
             sObject* new_hash = HASH_NEW_GC(16, TRUE);
+
+            sObject* current = runinfo->mCurrentObject;
+            sObject* tmp = access_object3(command->mArgsRuntime[1], &current);
+
+            if(tmp && !sCommand_option_item(command, "-force")) {
+                err_msg("can't overwrite other the same name variable. Use -force option", runinfo->mSName, runinfo->mSLine, command->mArgs[0]);
+                return FALSE;
+            }
+
             hash_put(object, command->mArgsRuntime[1], new_hash);
             sObject* key = STRING_NEW_STACK("");
             for(i=0; i<max; i++) {

--- a/src/run.c
+++ b/src/run.c
@@ -124,33 +124,6 @@ BOOL bufsiz_write(int fd, char* buf, int buf_size)
     return TRUE;
 }
 
-// TRUE: Success
-// FALSE: signal interrupt. set RCODE_SIGNAL_INTERRUPT on rcode and err message
-/*
-BOOL globalin_read(sObject* self, sObject* out, unsigned int line_number, enum eLineField lf)
-{
-    assert(TYPE(self) == T_FD && SFD(self).mKind == kFDKindBuf);
-    assert(TYPE(out) == T_FD && SFD(out).mKind == kFDKindBuf);
-
-    fd_split(self, lf);
-
-    if(line_number == 0) line_number = vector_count(SFD(self).fdbuf.mLines);
-
-    int i;
-    for(i=gGlobalPipeInReadNumber; i < vector_count(SFD(self).fdbuf.mLines) && i < line_number+gGlobalPipeInReadNumber; i++) {
-        char* line = vector_item(SFD(self).fdbuf.mLines, i);
-
-        if(!fd_write(out, line, strlen(line))) {
-            return FALSE;
-        }
-    }
-
-    gGlobalPipeInReadNumber += line_number;
-
-    return TRUE;
-}
-*/
-
 void fd_split(sObject* self, enum eLineField lf)
 {
     assert(TYPE(self) == T_FD && SFD(self).mKind == kFDKindBuf);
@@ -1124,7 +1097,7 @@ static BOOL redirect_ready(sObject** nextout, sObject** nextin, int* opened_fd,
                 break;
 
             case REDIRECT_APPEND:
-                if(SFD(*nextout).mKind == kFDKindBuf) {
+                if(*nextout == NULL) {
                     fd = open(command->mRedirectsFileNamesRuntime[i], O_WRONLY|O_APPEND|O_CREAT, 0644);
                     if(fd < 0) {
                         char buf[BUFSIZ];
@@ -1139,7 +1112,7 @@ static BOOL redirect_ready(sObject** nextout, sObject** nextin, int* opened_fd,
                 break;
 
             case REDIRECT_OUT:
-                if(SFD(*nextout).mKind == kFDKindBuf) {
+                if(*nextout == NULL) {
                     fd = open(command->mRedirectsFileNamesRuntime[i], O_WRONLY|O_CREAT|O_TRUNC, 0644);
                     if(fd < 0) {
                         char buf[BUFSIZ];
@@ -1239,30 +1212,33 @@ static BOOL statment_tree(sStatment* statment, sObject* pipein, sObject* pipeout
         const BOOL last_program = runinfo->mLastProgram = i == statment->mCommandsNum-1;
         runinfo->mFilter = i != 0 || (statment->mFlags & (STATMENT_CONTEXTPIPE|STATMENT_GLOBALPIPEIN));
 
-        sObject* nextout;
-        if(last_program) {
-            if(statment->mFlags & STATMENT_GLOBALPIPEOUT) {
-                fd_clear(gGlobalPipe);
-                nextout = gGlobalPipe;
-            }
-            else {
-                nextout = pipeout;
-            }
-        }
-        else {
-            nextout = FD_NEW_STACK(kFDKindBuf, 0);
-        }
-
         /// expand env ///
-        if(!sCommand_expand_env_redirect(command, nextin, nextout, runinfo))
+        if(!sCommand_expand_env_redirect(command, nextin, runinfo))
         {
             return FALSE;
         }
 
+        sObject* nextout = NULL;
+
         int opened_fd = -1;
         if(!redirect_ready(&nextout, &nextin, &opened_fd, pipeout, last_program, statment, command, runinfo)) {
             return TRUE;
         }
+        
+        if(nextout == NULL) {
+            if(last_program) {
+                if(statment->mFlags & STATMENT_GLOBALPIPEOUT) {
+                    fd_clear(gGlobalPipe);
+                    nextout = gGlobalPipe;
+                }
+                else {
+                    nextout = pipeout;
+                }
+            }
+            else {
+                nextout = FD_NEW_STACK(kFDKindBuf, 0);
+            }
+        }
 
         if(command->mArgsNum > 0) {
             if(command->mArgsEnv[0]) {

--- a/src/xyzsh/xyzsh.h
+++ b/src/xyzsh/xyzsh.h
@@ -741,7 +741,7 @@ char* sCommand_option_with_argument_item(sCommand* self, char* key);
 BOOL sCommand_put_option(sCommand* self, MANAGED char* key);
 BOOL sCommand_put_option_with_argument(sCommand* self, MANAGED char* key, MANAGED char* argument);
 BOOL sCommand_expand_env(sCommand* command, sObject* object, sObject* nextin, sObject* nextout, sRunInfo* runinfo);
-BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sObject* nextout, sRunInfo* runinfo);
+BOOL sCommand_expand_env_redirect(sCommand* command, sObject* nextin, sRunInfo* runinfo);
 void sCommand_sweep_runtime_info(sCommand* command);
 
 extern sObject* gMemChecker;

--- a/xyzsh.xyzsh
+++ b/xyzsh.xyzsh
@@ -13,7 +13,7 @@ print ~/.xyzsh | if(| -e) (
 print 1000 | export XYZSH_HISTSIZE
 print ~/.xyzsh/history | export XYZSH_HISTFILE
 
-print "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 "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 (
     | chomp | var -local prog
 
     try ( sys::run ( root::ref $prog )  | ref $prog) catch ()