summaryrefslogtreecommitdiff
path: root/scanner/scan.go
diff options
context:
space:
mode:
Diffstat (limited to 'scanner/scan.go')
-rw-r--r--scanner/scan.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/scanner/scan.go b/scanner/scan.go
index 5644932..ac2aa17 100644
--- a/scanner/scan.go
+++ b/scanner/scan.go
@@ -63,8 +63,11 @@ func (t *Token) IsSeparator() bool { return t.kind == Separator }
func (t *Token) Name() string {
name := t.content
+ if t.start > 1 {
+ return name[:t.start] + ".."
+ }
if t.start > 0 {
- name = name[:t.start] + ".." + name[len(name)-t.end:]
+ return name[:t.start] + ".." + name[len(name)-t.end:]
}
return name
}
@@ -295,7 +298,8 @@ func (sc *Scanner) getStr(src string, nstart int) (s string, ok bool) {
}
esc = canEscape && r == '\\' && !esc
}
- return
+ ok = prop&EosValidEnd != 0
+ return s, ok
}
func (sc *Scanner) getBlock(src string, nstart int) (s string, ok bool) {