Support return after function f()

Author: ryuichiueda

src/core/builtins/option_commands.rs

@@ -39,6 +39,7 @@ pub fn set_parameters(core: &mut ShellCore, args: &[String]) -> i32 {
         _    => {},
     }
     core.data.position_parameters.push(args.to_vec());
+    core.data.set_param("#", &(args.len()-1).to_string());
     0
 }
 

src/elements/command/function_def.rs

@@ -116,7 +116,21 @@ impl FunctionDefinition {
             return None;
         }
         ans.text += &feeder.consume(2);
-        command::eat_blank_with_comment(feeder, core, &mut ans.text);
+        loop {
+            if feeder.starts_with("\n") {
+                ans.text += &feeder.consume(1);
+                continue;
+            }
+
+            if feeder.len() == 0 {
+                if ! feeder.feed_additional_line(core) {
+                    return None;
+                }
+            }
+            if ! command::eat_blank_with_comment(feeder, core, &mut ans.text) {
+                break;
+            }
+        }
 
         Self::eat_compound_command(feeder, &mut ans, core);
         command::eat_blank_with_comment(feeder, core, &mut ans.text);

test/test_compound.bash

@@ -101,6 +101,9 @@ res=$($com <<< 'f () { echo a; } ; f')
 res=$($com <<< 'function f () { echo a; } ; f')
 [ "$res" = "a" ] || err $LINENO
 
+res=$($com <<< 'function _f () { echo a; } ; _f')
+[ "$res" = "a" ] || err $LINENO
+
 res=$($com <<< 'function f () { echo $A; } ; A=OK f')
 [ "$res" = "OK" ] || err $LINENO
 
@@ -344,6 +347,19 @@ EOF
 [ "$res" = "a
 a" ] || err $LINENO
 
+res=$($com <<< 'function f () { echo a; if true ; then return ; fi ; echo b; } ; f')
+[ "$res" = "a" ] || err $LINENO
+
+res=$($com << 'EOF'
+f()
+{
+	echo a;
+}
+EOF
+)
+[ "$?" = 0 ] || err $LINENO
+[ "$res" = "" ] || err $LINENO
+
 
 ### CASE TEST ###
 

test/test_others.bash

@@ -379,6 +379,9 @@ res=$($com <<< 'echo "" a')
 res=$($com <<< 'set a b c; echo a"$@"c')
 [ "$res" == "aa b cc" ] || err $LINENO
 
+res=$($com <<< 'set a b c; echo $#')
+[ "$res" == "3" ] || err $LINENO
+
 res=$($com <<< 'set a b c; A=( A"$@"C ); echo ${A[0]}')
 [ "$res" == "Aa" ] || err $LINENO