gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow using quotes around include"

Browse Source
This commit is contained in:
Waldemar Quevedo
2019-04-25 18:02:01 -07:00
committed by GitHub
parent 2d0abd66af
commit ff357d8317
2 changed files with 6 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
conf/lex.go
View File

@@ -343,10 +343,7 @@ func lexKeyStart(lx *lexer) stateFn {
func lexDubQuotedKey(lx *lexer) stateFn {
r := lx.peek()
if r == dqStringEnd {
include := lx.keyCheckKeyword(nil, nil)
if include != nil {
return include
}
lx.emit(itemKey)
lx.next()
return lexSkip(lx, lexKeyEnd)
} else if r == eof {
@@ -364,10 +361,7 @@ func lexDubQuotedKey(lx *lexer) stateFn {
func lexQuotedKey(lx *lexer) stateFn {
r := lx.peek()
if r == sqStringEnd {
include := lx.keyCheckKeyword(nil, nil)
if include != nil {
return include
}
lx.emit(itemKey)
lx.next()
return lexSkip(lx, lexKeyEnd)
} else if r == eof {
@@ -400,7 +394,7 @@ func (lx *lexer) keyCheckKeyword(fallThrough, push stateFn) stateFn {
// lexIncludeStart will consume the whitespace til the start of the value.
func lexIncludeStart(lx *lexer) stateFn {
r := lx.next()
if isWhitespace(r) || r == dqStringEnd || r == sqStringEnd || isKeySeparator(r) {
if isWhitespace(r) {
return lexSkip(lx, lexIncludeStart)
}
lx.backup()
@@ -447,7 +441,7 @@ func lexIncludeString(lx *lexer) stateFn {
lx.backup()
lx.emit(itemInclude)
return lx.pop()
case r == sqStringEnd || r == dqStringEnd:
case r == sqStringEnd:
lx.backup()
lx.emit(itemInclude)
lx.next()
@@ -674,10 +668,7 @@ func lexMapKeyStart(lx *lexer) stateFn {
func lexMapQuotedKey(lx *lexer) stateFn {
r := lx.peek()
if r == sqStringEnd {
include := lx.keyCheckKeyword(nil, lexMapValueEnd)
if include != nil {
return include
}
lx.emit(itemKey)
lx.next()
return lexSkip(lx, lexMapKeyEnd)
}
@@ -689,10 +680,7 @@ func lexMapQuotedKey(lx *lexer) stateFn {
func lexMapDubQuotedKey(lx *lexer) stateFn {
r := lx.peek()
if r == dqStringEnd {
include := lx.keyCheckKeyword(nil, lexMapValueEnd)
if include != nil {
return include
}
lx.emit(itemKey)
lx.next()
return lexSkip(lx, lexMapKeyEnd)
}