Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-10 19:58:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

checkpoint on new shparse

Browse Source
This commit is contained in:
sawka 2022-11-15 10:27:36 -08:00
parent b9fd4df60f
commit d44242fe71
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/shparse/shparse.go
View File

@ -223,6 +223,28 @@ func (c *parseContext) skipToChar(offset int, endCh rune, allowEsc bool) (int, b
}
}
// returns (new-offset, complete)
func (c *parseContext) skipToChar2(offset int, endCh rune, endCh2 rune, allowEsc bool) (int, bool) {
for {
ch := c.at(offset)
ch2 := c.at(offset + 1)
if ch == 0 {
return offset, false
}
if ch2 == 0 {
return offset + 1, false
}
if allowEsc && ch == '\\' {
offset += 2
continue
}
if ch == endCh && ch2 == endCh2 {
return offset + 2, true
}
offset++
}
}
func (c *parseContext) parseStrSQ() *wordType {
if !c.match('\'') {
return nil
@ -303,20 +325,31 @@ func (c *parseContext) parseExpansion() *wordType {
return nil
}
if c.match3('$', '(', '(') {
// arith expansion
return nil
newOffset, complete := c.skipToChar2(3, ')', ')', false)
w := &wordType{Type: WordTypeDPP, Offset: c.Pos, Raw: c.Input[c.Pos : c.Pos+newOffset], Complete: complete}
c.Pos = c.Pos + newOffset
return w
}
if c.match2('$', '(') {
// subshell
return nil
newOffset, complete := c.skipToChar(2, ')', false)
w := &wordType{Type: WordTypeDP, Offset: c.Pos, Raw: c.Input[c.Pos : c.Pos+newOffset], Complete: complete}
c.Pos = c.Pos + newOffset
return w
}
if c.match2('$', '[') {
// deprecated arith expansion
return nil
newOffset, complete := c.skipToChar(2, ']', false)
w := &wordType{Type: WordTypeDB, Offset: c.Pos, Raw: c.Input[c.Pos : c.Pos+newOffset], Complete: complete}
c.Pos = c.Pos + newOffset
return w
}
if c.match2('$', '{') {
// variable expansion
return nil
newOffset, complete := c.skipToChar(2, '}', false)
w := &wordType{Type: WordTypeVarBrace, Offset: c.Pos, Raw: c.Input[c.Pos : c.Pos+newOffset], Complete: complete}
c.Pos = c.Pos + newOffset
return w
}
ch2 := c.at(1)
if ch2 == 0 || unicode.IsSpace(ch2) {

4
pkg/shparse/shparse_test.go
View File

@ -31,4 +31,8 @@ func Test1(t *testing.T) {
testParse(t, `ls "hello" $'\''`)
testParse(t, `ls "foo`)
testParse(t, `echo $11 $xyz $ `)
testParse(t, `echo $(ls ${x:"hello"} foo`)
testParse(t, `ls ${x:"hello"} $[2+2] $((5 * 10)) $(ls; ls&)`)
testParse(t, `ls;ls&./foo > out 2> "out2"`)
testParse(t, `(( x = 5)); ls& cd ~/work/"hello again"`)
}