go
/
hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zclsyntax: separate tokens for assign = and equality test ==

This commit is contained in:
Martin Atkins 2017-06-04 16:00:40 -07:00
parent c3f4694e06
commit cac847b163
5 changed files with 411 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zcl/zclsyntax/expression_ops.go
View File

@ -45,7 +45,7 @@ func init() {
TokenAnd: OpLogicalAnd,
},
{
TokenEqual: OpEqual,
TokenEqualOp: OpEqual,
TokenNotEqual: OpNotEqual,
},
{

785
zcl/zclsyntax/scan_tokens.go
View File

File diff suppressed because it is too large Load Diff

2
zcl/zclsyntax/scan_tokens.rl
View File

@ -39,6 +39,7 @@ func scanTokens(data []byte, filename string, start zcl.Pos, mode scanMode) []To
# Symbols that just represent themselves are handled as a single rule.
SelfToken = "[" | "]" | "(" | ")" | "." | "," | "*" | "/" | "+" | "-" | "=" | "<" | ">" | "!" | "?" | ":" | "\n" | "&" | "|" | "~" | "^" | ";" | "`";
EqualOp = "==";
NotEqual = "!=";
GreaterThanEqual = ">=";
LessThanEqual = "<=";
@ -241,6 +242,7 @@ func scanTokens(data []byte, filename string, start zcl.Pos, mode scanMode) []To
Comment => { token(TokenComment) };
Newline => { token(TokenNewline) };
EqualOp => { token(TokenEqualOp); };
NotEqual => { token(TokenNotEqual); };
GreaterThanEqual => { token(TokenGreaterThanEq); };
LessThanEqual => { token(TokenLessThanEq); };

1
zcl/zclsyntax/token.go
View File

@ -47,6 +47,7 @@ const (
TokenPercent TokenType = '%'
TokenEqual TokenType = '='
TokenEqualOp TokenType = '≔'
TokenNotEqual TokenType = '≠'
TokenLessThan TokenType = '<'
TokenLessThanEq TokenType = '≤'

19
zcl/zclsyntax/token_type_string.go
View File

@ -4,7 +4,7 @@ package zclsyntax
import "fmt"
const _TokenType_name = "TokenNilTokenNewlineTokenBangTokenPercentTokenBitwiseAndTokenOParenTokenCParenTokenStarTokenPlusTokenCommaTokenMinusTokenDotTokenSlashTokenColonTokenSemicolonTokenLessThanTokenEqualTokenGreaterThanTokenQuestionTokenCommentTokenOHeredocTokenIdentTokenNumberLitTokenQuotedLitTokenStringLitTokenOBrackTokenCBrackTokenBitwiseXorTokenBacktickTokenCHeredocTokenOBraceTokenBitwiseOrTokenCBraceTokenBitwiseNotTokenOQuoteTokenCQuoteTokenTemplateControlTokenTemplateSeqEndTokenAndTokenOrTokenTemplateInterpTokenNotEqualTokenLessThanEqTokenGreaterThanEqTokenEOFTokenTabsTokenStarStarTokenInvalidTokenBadUTF8"
const _TokenType_name = "TokenNilTokenNewlineTokenBangTokenPercentTokenBitwiseAndTokenOParenTokenCParenTokenStarTokenPlusTokenCommaTokenMinusTokenDotTokenSlashTokenColonTokenSemicolonTokenLessThanTokenEqualTokenGreaterThanTokenQuestionTokenCommentTokenOHeredocTokenIdentTokenNumberLitTokenQuotedLitTokenStringLitTokenOBrackTokenCBrackTokenBitwiseXorTokenBacktickTokenCHeredocTokenOBraceTokenBitwiseOrTokenCBraceTokenBitwiseNotTokenOQuoteTokenCQuoteTokenTemplateControlTokenTemplateSeqEndTokenAndTokenOrTokenTemplateInterpTokenEqualOpTokenNotEqualTokenLessThanEqTokenGreaterThanEqTokenEOFTokenTabsTokenStarStarTokenInvalidTokenBadUTF8"
var _TokenType_map = map[TokenType]string{
0: _TokenType_name[0:8],
@ -48,14 +48,15 @@ var _TokenType_map = map[TokenType]string{
8743: _TokenType_name[462:470],
8744: _TokenType_name[470:477],
8747: _TokenType_name[477:496],
8800: _TokenType_name[496:509],
8804: _TokenType_name[509:524],
8805: _TokenType_name[524:542],
9220: _TokenType_name[542:550],
9225: _TokenType_name[550:559],
10138: _TokenType_name[559:572],
65533: _TokenType_name[572:584],
128169: _TokenType_name[584:596],
8788: _TokenType_name[496:508],
8800: _TokenType_name[508:521],
8804: _TokenType_name[521:536],
8805: _TokenType_name[536:554],
9220: _TokenType_name[554:562],
9225: _TokenType_name[562:571],
10138: _TokenType_name[571:584],
65533: _TokenType_name[584:596],
128169: _TokenType_name[596:608],
}
func (i TokenType) String() string {