Change test version

Author: ryuichiueda

.github/workflows/macos.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Bash tests
       run: |
         dir=$PWD
-        git clone https://github.com/shellgei/rusty_bash_test -b v1.2.1 --depth 1
+        git clone https://github.com/shellgei/rusty_bash_test -b v1.2.2 --depth 1
         #git clone https://github.com/shellgei/rusty_bash_test --depth 1
         cd rusty_bash_test
         ./test.bash $dir

.github/workflows/ubuntu.yml

@@ -20,7 +20,6 @@ jobs:
     - name: Bash tests
       run: |
         dir=$PWD
-        git clone https://github.com/shellgei/rusty_bash_test -b v1.2.1 --depth 1
-        #git clone https://github.com/shellgei/rusty_bash_test --depth 1
+        git clone https://github.com/shellgei/rusty_bash_test -b v1.2.2 --depth 1
         cd rusty_bash_test
         ./test.bash $dir

.sushrc

@@ -30,34 +30,6 @@ alias ll='ls -l'
 alias git-writing='git add -A ; git commit -m Writing ; git push'
 
 
-# completion test
-# thanks to: https://blog.cybozu.io/entry/2016/09/26/080000
-
-#_dummy () {
-#	COMPREPLY=( $(compgen -W "one two" -- "${cur}" ) ) 
-#} && complete -F _dummy hoge
-#
-#_git_comp () {
-#	if [ "$COMP_CWORD" = 1 ] ; then 
-#		CANDS=( $( git |& grep '^  *[a-z]' | awk '{print $1}') ) 
-#		COMPREPLY=( $(compgen -W "${CANDS[@]}" -- "${cur}") ) 
-#	elif [ "$COMP_CWORD" = 2 -a "$prev" = switch ] ; then
-#		COMPREPLY=( $(compgen -W "$( git branch | tr -d '*' )" -- "${cur}" ) ) 
-#	elif [ "$COMP_CWORD" = 2 -a "$prev" = merge ] ; then
-#		COMPREPLY=( $(compgen -W "$( git branch | tr -d '*' )" -- "${cur}" ) ) 
-#	elif [ "$COMP_CWORD" = 2 -a "$prev" = diff ] ; then
-#		COMPREPLY=( $(compgen -W "$( git branch | tr -d '*' ) $(compgen -f)" -- "${cur}" ) ) 
-#	fi
-#} && complete -F _git_comp git
-#
-#_colcon_comp () {
-#        if [ "$COMP_CWORD" = 1 ] ; then 
-#                CANDS=( $( colcon |& sed -n 2p | tr , \\n | tr -d '{} ' ) ) 
-#                COMPREPLY=( $(compgen -W "${CANDS[@]}" -- "${cur}") ) 
-#        fi
-#} && complete -F _colcon_comp colcon
-
-
 command_not_found_handle() { #command_not_found should be loaded before bash-completion in this stage
 	if [ -e /usr/lib/command-not-found ] ; then
 		/usr/lib/command-not-found -- "$1"
@@ -78,6 +50,3 @@ elif [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
     complete -d cd
 fi
-
-
-

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "sush"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 nix = { version = "0.29.0", features = ["fs", "process", "signal", "term", "user", "time", "hostname", "resource"]}
-termion = "4.0.3"
+termion = "4.0.5"
 unicode-width = "0.1.11"
 signal-hook = "0.3.17"
 rev_lines = "0.3.0"

README.md

@@ -42,7 +42,7 @@ ueda@uedaP1g6:main🌵~/GIT/rusty_bash🍣
 
 ## Comparison with Bash 5.2
 
-This graph shows the test result with the script in `./sush_test/bash_genuine_test` of [this test repository](https://github.com/ryuichiueda/bash_for_sush_test). Currently, the binary built from alpha repo has passed 24 of 84 test scripts.
+This graph shows the test result with the script in `./sush_test/bash_genuine_test` of [this test repository](https://github.com/ryuichiueda/bash_for_sush_test). Currently, the binary built from alpha repo has passed 27 of 84 test scripts.
 
 ![](https://github.com/ryuichiueda/bash_for_sush_test/blob/master/sush_test/graph.png)
 
@@ -77,6 +77,9 @@ The following behavior of Bash will not be imitated by `sush`. So we alter the r
     🍣 (( 1++     ))
     sush: ((: 1++     : syntax error: operand expected (error token is "+")
     ```
+* error messages of `readonly`
+    * We added `readonly: ` to the messages in `attr.right`.
+        * e.g.: `./attr.tests: line 17: a: readonly variable` -> `./attr.tests: line 17: readonly: a: readonly variable`
 
 ## Contribution
 

error

@@ -63,3 +63,39 @@
 ./test_fixed.bash
 ./test_fixed.bash
 ./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_job.bash
+./test_job.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash
+./test_fixed.bash

src/core/builtins/alias.rs

@@ -4,7 +4,11 @@
 use crate::ShellCore;
 
 pub fn alias(core: &mut ShellCore, args: &[String]) -> i32 {
-    if args.len() == 1 {
+    if args.len() == 1 
+    || args.len() == 2 && args[1] == "-p" {
+        if ! core.shopts.query("expand_aliases") {
+            return 0;
+        }
         for k in &core.db.get_indexes_all("BASH_ALIASES") {
             let v = core.db.get_elem("BASH_ALIASES", k).unwrap();
             println!("alias {k}='{v}'");
@@ -14,10 +18,17 @@ pub fn alias(core: &mut ShellCore, args: &[String]) -> i32 {
 
     if args.len() == 2 && args[1].contains("=") {
         let kv: Vec<String> = args[1].split('=').map(|t| t.to_string()).collect();
-        //core.aliases.insert(kv[0].clone(), kv[1..].join("="));
         let _ = core
             .db
             .set_assoc_elem("BASH_ALIASES", &kv[0], &kv[1..].join("="), None);
+        return 0;
+    }
+
+    if args.len() == 2
+        && core.db.has_array_value("BASH_ALIASES", &args[1]) {
+        let alias = core.db.get_elem("BASH_ALIASES", &args[1]).unwrap();
+        println!("alias {}='{}'", &args[1], &alias);
+        return 0;
     }
 
     0

src/core/builtins/command.rs

@@ -4,7 +4,7 @@
 use crate::elements::command::simple::SimpleCommand;
 use crate::elements::io::pipe::Pipe;
 use crate::utils::{arg, file};
-use crate::{error, proc_ctrl, ShellCore};
+use crate::{error, file_check, proc_ctrl, ShellCore, utils};
 
 pub fn builtin(core: &mut ShellCore, args: &[String]) -> i32 {
     if args.len() <= 1 {
@@ -27,7 +27,14 @@ fn command_v(words: &[String], core: &mut ShellCore, large_v: bool) -> i32 {
     let mut return_value = 1;
 
     for com in words.iter() {
-        if core.db.has_array_value("BASH_ALIASES", com) {
+        if utils::reserved(com) {
+            return_value = 0;
+            match large_v {
+                true => println!("{} is a shell keyword", &com),
+                false => println!("{}", &com),
+            }
+        } else if core.db.has_array_value("BASH_ALIASES", com) {
+            return_value = 0;
             let alias = core.db.get_elem("BASH_ALIASES", com).unwrap();
             match large_v {
                 true => println!("{} is aliased to `{}'", &com, &alias),
@@ -40,12 +47,27 @@ fn command_v(words: &[String], core: &mut ShellCore, large_v: bool) -> i32 {
                 true => println!("{} is a shell builtin", &com),
                 false => println!("{}", &com),
             }
+        } else if core.db.functions.contains_key(com) {
+            return_value = 0;
+            match large_v {
+                true => {
+                    println!("{} is a function", &com);
+                    core.db.functions.get_mut(com).unwrap().pretty_print(0);
+                },
+                false => println!("{}", &com),
+            }
         } else if let Some(path) = file::search_command(com) {
             return_value = 0;
             match large_v {
                 true => println!("{} is {}", &com, &path),
                 false => println!("{}", &com),
             }
+        } else if file_check::is_executable(com) {
+            return_value = 0;
+            match large_v {
+                true => println!("{} is {}", &com, &com),
+                false => println!("{}", &com),
+            }
         } else if large_v {
             let msg = format!("command: {com}: not found");
             error::print(&msg, core);

src/core/builtins/loop_control.rs

@@ -57,15 +57,17 @@ pub fn continue_(core: &mut ShellCore, args: &[String]) -> i32 {
         return 0;
     }
 
-    core.continue_counter += 1;
+    //core.continue_counter += 1;
+    core.continue_counter = 1;
     if args.len() < 2 {
         return 0;
     }
 
     match args[1].parse::<i32>() {
         Ok(n) => {
             if n > 0 {
-                core.continue_counter += n - 1;
+                //core.continue_counter += n - 1;
+                core.continue_counter = n;
             } else {
                 eprintln!("sush: continue: {}: loop count out of range", args[1]);
                 return 1;

src/core/builtins/option.rs

@@ -115,7 +115,6 @@ pub fn set(core: &mut ShellCore, args: &[String]) -> i32 {
     if args[1].starts_with("--") {
         args[1] = core.db.position_parameters[0][0].clone();
         args.remove(0);
-        dbg!("{:?}", &args);
         match set_positions(core, &args) {
             Ok(()) => return 0,
             Err(e) => {
@@ -152,6 +151,8 @@ pub fn set(core: &mut ShellCore, args: &[String]) -> i32 {
         if let Err(e) = set_positions(core, &args) {
             e.print(core);
             return 2;
+        }else{
+            return 0;
         }
     }