Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions eval_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -661,3 +661,21 @@ func TestApplyLocalBoolOpt(t *testing.T) {
}
}
}

func TestParseSetValueQuoting(t *testing.T) {
for _, inp := range []string{`set dupfilefmt %f.~%n~`, `setlocal /tmp promptfmt $x`} {
p := newParser(strings.NewReader(inp))
if p.parse() {
t.Errorf("parse(%q) evaluated %v despite error %v", inp, p.expr, p.err)
}
if p.err == nil {
t.Errorf("parse(%q) expected error", inp)
}
}
for _, inp := range []string{`set dupfilefmt "%f.~%n~"`, `set hidden!`, "set hidden"} {
p := newParser(strings.NewReader(inp))
if !p.parse() || p.err != nil {
t.Errorf("parse(%q) rejected: %v", inp, p.err)
}
}
}
13 changes: 13 additions & 0 deletions parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ func (p *parser) parseExpr() expr {

s.scan()
if s.typ != tokenSemicolon {
if s.typ != tokenIdent {
p.err = fmt.Errorf("set %s: unexpected %q, value must be quoted", opt, s.tok)
return nil
}
val = s.tok
s.scan()
}
Expand All @@ -261,6 +265,10 @@ func (p *parser) parseExpr() expr {

s.scan()
if s.typ != tokenSemicolon {
if s.typ != tokenIdent {
p.err = fmt.Errorf("setlocal %s: unexpected %q, value must be quoted", opt, s.tok)
return nil
}
val = s.tok
s.scan()
}
Expand Down Expand Up @@ -410,5 +418,10 @@ func (p *parser) parseExpr() expr {

func (p *parser) parse() bool {
p.expr = p.parseExpr()
if p.err != nil {
// never evaluate an expression that produced a parse error
p.expr = nil
return false
}
return p.expr != nil
}