From b536b01eebd59c09d53aa44f667e1f45d263e4ef Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Thu, 25 Aug 2022 00:01:28 -0400 Subject: [PATCH] Added new tokens to test case --- lexer/lexer_test.go | 4 ++++ lexer/token.go | 10 ++++++++-- tests/lexer/all.arf | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go index dcc6846..6f2aec1 100644 --- a/lexer/lexer_test.go +++ b/lexer/lexer_test.go @@ -153,9 +153,13 @@ func TestTokenizeAll (test *testing.T) { quickToken(1, TokenKindExclamation, nil), quickToken(1, TokenKindPercent, nil), quickToken(1, TokenKindTilde, nil), + quickToken(1, TokenKindEqualTo, nil), + quickToken(1, TokenKindNotEqualTo, nil), quickToken(1, TokenKindLessThan, nil), + quickToken(1, TokenKindLessThanEqualTo, nil), quickToken(2, TokenKindLShift, nil), quickToken(1, TokenKindGreaterThan, nil), + quickToken(1, TokenKindGreaterThanEqualTo, nil), quickToken(2, TokenKindRShift, nil), quickToken(1, TokenKindBinaryOr, nil), quickToken(2, TokenKindLogicalOr, nil), diff --git a/lexer/token.go b/lexer/token.go index 2bfb2e6..3b41a41 100644 --- a/lexer/token.go +++ b/lexer/token.go @@ -45,8 +45,6 @@ const ( TokenKindPercent TokenKindTilde - // TODO: add equal to, less than or equal to, greater than or equal to, - // not equal to TokenKindEqualTo TokenKindNotEqualTo TokenKindLessThanEqualTo @@ -179,12 +177,20 @@ func (tokenKind TokenKind) Describe () (description string) { description = "Percent" case TokenKindTilde: description = "Tilde" + case TokenKindEqualTo: + description = "EqualTo" + case TokenKindNotEqualTo: + description = "NotEqualTo" case TokenKindLessThan: description = "LessThan" + case TokenKindLessThanEqualTo: + description = "LessThanEqualTo" case TokenKindLShift: description = "LShift" case TokenKindGreaterThan: description = "GreaterThan" + case TokenKindGreaterThanEqualTo: + description = "GreaterThanEqualTo" case TokenKindRShift: description = "RShift" case TokenKindBinaryOr: diff --git a/tests/lexer/all.arf b/tests/lexer/all.arf index 29834fe..07e0298 100644 --- a/tests/lexer/all.arf +++ b/tests/lexer/all.arf @@ -1,3 +1,3 @@ :arf --- rw -> -349820394 932748397 239485.37520 "hello world!\n" 'E' helloWorld:.,..[]{} -+ - ++ -- * / @ ! % ~ < << > >> | || & && ++ - ++ -- * / @ ! % ~ = != < <= << > => >> | || & &&