fix and simplify Token.Name()

1 files changed, 5 insertions, 6 deletions

diff --git a/scanner/scan.go b/scanner/scan.go
index 6ea99a9..2782788 100644
--- a/scanner/scan.go
+++ b/scanner/scan.go
@@ -34,14 +34,13 @@ func (t *Token) Prefix() string { return t.Str[:t.Beg] }
 
 // Name return the name of t (short string for debugging).
 func (t *Token) Name() string {
-	name := t.Str
-	if t.Beg > 1 {
-		return name[:t.Beg] + ".."
+	if len(t.Str) == 0 {
+		return ""
 	}
-	if t.Beg > 0 {
-		return name[:t.Beg] + ".." + name[len(name)-t.End:]
+	if t.Beg > 1 {
+		return t.Str[:t.Beg] + ".."
 	}
-	return name
+	return t.Str[:t.Beg] + ".." + t.Str[len(t.Str)-t.End:]
 }
 
 func (t *Token) String() string {