From b09a14147d397904722ee7c25e4defc56135b96f Mon Sep 17 00:00:00 2001 From: Mel Date: Mon, 9 May 2022 00:01:02 +0200 Subject: Extract source walk part of scanner --- pkg/lang/scanner/token/loc.go | 10 ---------- pkg/lang/scanner/token/token.go | 8 +++++--- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 pkg/lang/scanner/token/loc.go (limited to 'pkg/lang/scanner/token') diff --git a/pkg/lang/scanner/token/loc.go b/pkg/lang/scanner/token/loc.go deleted file mode 100644 index 7936cba..0000000 --- a/pkg/lang/scanner/token/loc.go +++ /dev/null @@ -1,10 +0,0 @@ -package token - -type Loc struct { - Row int - Col int -} - -func NewLoc(row, col int) Loc { - return Loc{row, col} -} diff --git a/pkg/lang/scanner/token/token.go b/pkg/lang/scanner/token/token.go index 1ccd864..a39df8a 100644 --- a/pkg/lang/scanner/token/token.go +++ b/pkg/lang/scanner/token/token.go @@ -1,19 +1,21 @@ package token +import "jinx/pkg/libs/source" + type Token struct { Kind TokenKind - At Loc + At source.Loc Data any } -func Simple(kind TokenKind, at Loc) Token { +func Simple(kind TokenKind, at source.Loc) Token { return Token{ Kind: kind, At: at, } } -func New(kind TokenKind, at Loc, data any) Token { +func New(kind TokenKind, at source.Loc, data any) Token { return Token{ Kind: kind, At: at, -- cgit 1.4.1