From 4d73fa4b83e8330d3786fb81a3693cd9555f5268 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Thu, 11 Aug 2022 03:58:45 -0500 Subject: [PATCH] Fixed equality issue with int --- lexer/lexer_test.go | 11 +++++++---- lexer/token.go | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go index 9865564..3c7e5d1 100644 --- a/lexer/lexer_test.go +++ b/lexer/lexer_test.go @@ -15,8 +15,8 @@ func TestTokenizeAll (test *testing.T) { tokens, err := Tokenize(file) // print all tokens - for _, token := range tokens { - test.Log("got token:", token.Describe()) + for index, token := range tokens { + test.Log(index, "\tgot token:", token.Describe()) } if err != nil { @@ -33,8 +33,8 @@ func TestTokenizeAll (test *testing.T) { External: types.ModeWrite, }}, Token { kind: TokenKindReturnDirection }, - Token { kind: TokenKindInt, value: -349820394 }, - Token { kind: TokenKindUInt, value: 932748397 }, + Token { kind: TokenKindInt, value: int64(-349820394) }, + Token { kind: TokenKindUInt, value: uint64(932748397) }, Token { kind: TokenKindFloat, value: 239485.37520 }, Token { kind: TokenKindString, value: "hello world\n" }, Token { kind: TokenKindRune, value: 'E' }, @@ -77,6 +77,9 @@ func TestTokenizeAll (test *testing.T) { for index, token := range tokens { if !token.Equals(correct[index]) { test.Log("token", index, "not equal") + test.Log ( + "have", token.Describe(), + "want", correct[index].Describe()) test.Fail() return } diff --git a/lexer/token.go b/lexer/token.go index 3ab98a8..0ac8298 100644 --- a/lexer/token.go +++ b/lexer/token.go @@ -78,7 +78,7 @@ func (token Token) Value () (value any) { // Equals returns whether this token is equal to another token func (token Token) Equals (testToken Token) (match bool) { - return token.value == testToken.value + return token == testToken } // Location returns the location of the token in its file.