Skip to content

Enables | close to variable token #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
i4ki wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enables | close to variable token #195

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dbb86e
Enables | close to variable token
i4ki Mar 29, 2017
3eabf85
fix comment
i4ki Mar 29, 2017
aab08e2
improve the code and comments
i4ki Aug 7, 2017
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
28 changes: 17 additions & 11 deletions scanner/lex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,25 +282,23 @@ func lexStart(l *Lexer) stateFn {

absorbIdentifier(l)

next := l.peek()

// required to avoid the sintaxes below:
// rm -rf $HOME/projects
// rm -rf $GOPATH/test
// for being interpreted as:
// rm -rf $HOME /projects
// rm -rf $GOPATH /test
//
// The list of runes below are the ones allowed to exists close
// to the variable. Eg.:
// Below are the valid suffixes for variables:
// $HOME;
// $HOME[0]
// $HOME()
// $HOME+"a"
next := l.peek()
if next != eof && !isSpace(next) &&
!isEndOfLine(next) && next != ';' &&
next != ')' && next != ',' && next != '+' &&
next != '[' && next != ']' && next != '(' &&
next != '|' {
// $HOME[ # used in: $HOME[0]
// $HOME( # used in: $callback()
// $HOME+ # used in: $HOME+"/src"
// $HOME] # used in: $list[$index]
// $HOME) # used in: call($HOME)
if !isValidVariableSuffix(next) {
Copy link
Copy Markdown
Member

@katcipis katcipis Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a nice refactoring. You sir are a gentleman:

gentleman

l.errorf("Unrecognized character in action: %#U", next)
return nil
}
Expand Down Expand Up @@ -564,3 +562,11 @@ func isAlpha(r rune) bool {
func isEndOfLine(r rune) bool {
return r == '\r' || r == '\n'
}

func isValidVariableSuffix(r rune) bool {
return r == eof || isSpace(r) ||
isEndOfLine(r) || r == ';' ||
r == ')' || r == ',' || r == '+' ||
r == '[' || r == ']' || r == '(' ||
r == '|'
}