Don't negate exit status of return (#46224)

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/yash/yash/trunk@4223 048f04df-13f5-43d7-8114-9f9ceecaec24
magicant · Dec 9, 2022 · ba43abb · ba43abb
1 parent 7241b5e
commit ba43abb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -33,6 +33,8 @@ Yash 2.54 (Unreleased)
      when the operand names a symbolic link to a non-existing file.
   *  The exported value of the $DIRSTACK variable was not being
      updated correctly in the "pushd" and "popd" built-ins.
+  *  The effect of "!" no longer applies to the exit status of the
+     "break", "continue", and "return" built-ins.
 
 ----------------------------------------------------------------------
 Yash 2.53 (2022-08-23)

diff --git a/NEWS.ja b/NEWS.ja
@@ -29,6 +29,8 @@ Yash 2.54 (未リリース)
      リンクを ">" リダイレクトで開こうとすると無限ループしていた
   *  $DIRSTACK 変数がエクスポートされているとき、"pushd" および "popd"
      組込みで $DIRSTACK 変数の値が正しく更新されていなかった
+  *  "break", "continue", "return" 組込みの終了ステータスが "!" で反転
+     されていた
 
 ----------------------------------------------------------------------
 Yash 2.53 (2022-08-23)

diff --git a/exec.c b/exec.c
@@ -322,9 +322,7 @@ void exec_and_or_lists(const and_or_T *a, bool finally_exit)
 /* Executes the pipelines. */
 void exec_pipelines(const pipeline_T *p, bool finally_exit)
 {
-    for (bool first = true;
-	    p != NULL && !need_break();
-	    p = p->next, first = false) {
+    for (bool first = true; p != NULL; p = p->next, first = false) {
 	if (!first && p->pl_cond == (laststatus != Exit_SUCCESS))
 	    continue;
 
@@ -335,14 +333,18 @@ void exec_pipelines(const pipeline_T *p, bool finally_exit)
 
 	bool self = finally_exit && !p->next && !p->pl_neg;
 	exec_commands(p->pl_commands, self ? E_SELF : E_NORMAL);
+
+	suppresserrexit = savesee, suppresserrreturn = saveser;
+
+	if (need_break())
+	    break;
+
 	if (p->pl_neg) {
 	    if (laststatus == Exit_SUCCESS)
 		laststatus = Exit_FAILURE;
 	    else
 		laststatus = Exit_SUCCESS;
 	}
-
-	suppresserrexit = savesee, suppresserrreturn = saveser;
     }
     if (finally_exit)
 	exit_shell();

diff --git a/tests/pipeline-y.tst b/tests/pipeline-y.tst
@@ -1,5 +1,10 @@
 # pipeline-y.tst: yash-specific test of pipeline
 
+test_OE -e 42 '! with return'
+f() { ! return 42; }
+f
+__IN__
+
 test_Oe -e 2 'no command before |'
 | echo foo
 __IN__