Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

update rtnstate detection, support blocks, and binary expressions

Browse Source
This commit is contained in:
sawka 2023-12-18 15:02:55 -08:00
parent 7a37fdb942
commit 8d71f5538c
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wavesrv/pkg/cmdrunner/shparse.go
View File

@ -208,16 +208,26 @@ func getCallExprLitArg(callExpr *syntax.CallExpr, argNum int) string {
return lit.Value
}
// detects: export, declare, ., source, X=1, unset
func IsReturnStateCommand(cmdStr string) bool {
cmdReader := strings.NewReader(cmdStr)
parser := syntax.NewParser(syntax.Variant(syntax.LangBash))
file, err := parser.Parse(cmdReader, "cmd")
if err != nil {
func isRtnStateCmd(cmd syntax.Command) bool {
if cmd == nil {
return false
}
for _, stmt := range file.Stmts {
if callExpr, ok := stmt.Cmd.(*syntax.CallExpr); ok {
if _, ok := cmd.(*syntax.FuncDecl); ok {
return true
}
if blockExpr, ok := cmd.(*syntax.Block); ok {
for _, stmt := range blockExpr.Stmts {
if isRtnStateCmd(stmt.Cmd) {
return true
}
}
return false
}
if binExpr, ok := cmd.(*syntax.BinaryCmd); ok {
if isRtnStateCmd(binExpr.X.Cmd) || isRtnStateCmd(binExpr.Y.Cmd) {
return true
}
} else if callExpr, ok := cmd.(*syntax.CallExpr); ok {
if len(callExpr.Assigns) > 0 && len(callExpr.Args) == 0 {
return true
}
@ -231,7 +241,22 @@ func IsReturnStateCommand(cmdStr string) bool {
return true
}
}
} else if _, ok := stmt.Cmd.(*syntax.DeclClause); ok {
} else if _, ok := cmd.(*syntax.DeclClause); ok {
return true
}
return false
}
// detects: export, declare, ., source, X=1, unset
func IsReturnStateCommand(cmdStr string) bool {
cmdReader := strings.NewReader(cmdStr)
parser := syntax.NewParser(syntax.Variant(syntax.LangBash))
file, err := parser.Parse(cmdReader, "cmd")
if err != nil {
return false
}
for _, stmt := range file.Stmts {
if isRtnStateCmd(stmt.Cmd) {
return true
}
}

3
wavesrv/pkg/cmdrunner/shparse_test.go
View File

@ -58,5 +58,6 @@ func TestIsReturnStateCommand(t *testing.T) {
testRSC(t, "unset FOO BAR", true)
testRSC(t, "FOO=1; ls", true)
testRSC(t, ". ./test", true)
testRSC(t, "{ FOO=6; }", false)
testRSC(t, "{ FOO=6; }", true)
testRSC(t, "cd foo && ls -l", true)
}