From 6892001bbc38e19c6f06cf9e78390962b007bc4f Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 16 Nov 2015 19:14:05 +0100
Subject: add tty-related ioctl's

---
 sysgen/parser.go | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'sysgen/parser.go')

diff --git a/sysgen/parser.go b/sysgen/parser.go
index 92c27c58a..7d322eec4 100644
--- a/sysgen/parser.go
+++ b/sysgen/parser.go
@@ -67,21 +67,29 @@ func (p *Parser) SkipWs() {
 }
 
 func (p *Parser) Ident() string {
-	i := p.i
-	for p.i < len(p.s) &&
-		(p.s[p.i] >= 'a' && p.s[p.i] <= 'z' ||
-			p.s[p.i] >= 'A' && p.s[p.i] <= 'Z' ||
-			p.s[p.i] >= '0' && p.s[p.i] <= '9' ||
-			p.s[p.i] == '_' || p.s[p.i] == '$') { // $ is for n-way syscalls (like ptrace$peek)
-		p.i++
-	}
-	if i == p.i {
-		p.failf("failed to parse identifier at pos %v", i)
-	}
-	if ch := p.s[i]; ch >= '0' && ch <= '9' {
-		// p.failf("identifier starts with a digit at pos %v", i)
+	start, end := p.i, 0
+	if p.Char() == '"' {
+		p.Parse('"')
+		start++
+		for p.Char() != '"' {
+			p.i++
+		}
+		end = p.i
+		p.Parse('"')
+	} else {
+		for p.i < len(p.s) &&
+			(p.s[p.i] >= 'a' && p.s[p.i] <= 'z' ||
+				p.s[p.i] >= 'A' && p.s[p.i] <= 'Z' ||
+				p.s[p.i] >= '0' && p.s[p.i] <= '9' ||
+				p.s[p.i] == '_' || p.s[p.i] == '$') { // $ is for n-way syscalls (like ptrace$peek)
+			p.i++
+		}
+		if start == p.i {
+			p.failf("failed to parse identifier at pos %v", start)
+		}
+		end = p.i
 	}
-	s := p.s[i:p.i]
+	s := p.s[start:end]
 	p.SkipWs()
 	return s
 }
-- 
cgit mrf-deployment