From e2ecf8b80abb3c04c59b05043c5fef10b5c32acb Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Thu, 5 Jan 2012 13:24:27 +0100
Subject: [PATCH] Revert "I can parse again"

This reverts commit 0d08da5d844b02a48297eec88ed0f4b0b966985e.
---
 zscan.go | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/zscan.go b/zscan.go
index ccd0374b..7970656c 100644
--- a/zscan.go
+++ b/zscan.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Only used when debugging the parser itself.
-var _DEBUG = false
+var _DEBUG = true
 
 // Tokinize a RFC 1035 zone file. The tokenizer will normalize it:
 // * Add ownernames if they are left blank;
@@ -315,6 +315,7 @@ func zlexer(r io.Reader, c chan lex) {
 			} else if owner {
 				// If we have a string and its the first, make it an owner
 				l.value = _OWNER
+				println(p, q)
 				l.token = string(buf[p:q])
 				// escape $... start with a \ not a $, so this will work
 				if l.token == "$TTL" {
@@ -352,6 +353,7 @@ func zlexer(r io.Reader, c chan lex) {
 			}
 			owner = false
 			space = true
+			println("upping", p, q)
 		case ';':
 			if escape {
 				escape = false
@@ -411,6 +413,7 @@ func zlexer(r io.Reader, c chan lex) {
 			}
 
 			p = q + 1
+			println("hallo")
 			commt = false
 			rrtype = false
 			owner = true
@@ -443,7 +446,6 @@ func zlexer(r io.Reader, c chan lex) {
 				escape = false
 				break
 			}
-			p++
 			brace++
 		case ')':
 			if commt {
@@ -461,7 +463,6 @@ func zlexer(r io.Reader, c chan lex) {
 				p = q + 1
 				return
 			}
-			p++
 		default:
 			if commt {
 				p++
@@ -472,26 +473,20 @@ func zlexer(r io.Reader, c chan lex) {
 		}
 		// tok, err = r.ReadByte() read extra bytes
 		q++
-		if q > n-1 {  // Funny, 'cause q starts at zero
-			// Read in a new chunk. Every thing before p 
-			// can be discarded. 
-                        n1 := copy(buf, buf[p:])
-			// Reset the indices
-			q = q - p
-			p = 0
-			// Read a new chunk
-			n, err = r.Read(buf[n1:])
+		if q > n {
+			break
 		}
 	}
-	// It this need anymore???
-	/*
-		if p != q {
-			// Send remainder
-			l.token = string(buf[p:q])
-			l.value = _STRING
-			c <- l
-		}
-	*/
+	println("We crashen gewoon hier", p, q)
+        // It this need anymore???
+        /*
+	if p != q {
+		// Send remainder
+		l.token = string(buf[p:q])
+		l.value = _STRING
+		c <- l
+	}
+        */
 }
 
 func stringToTtl(l lex, t chan Token) (uint32, bool) {