From bd25006897e9d1006d5f9a5c3a012646fd3df67c Mon Sep 17 00:00:00 2001
From: Sasha Koshka <sashakoshka@tebibyte.media>
Date: Sat, 17 Sep 2022 11:50:27 -0400
Subject: [PATCH] Fixed some errors that cropped up in the data section test

---
 parser/data_test.go        | 4 ++--
 parser/type-notation.go    | 8 ++++----
 tests/parser/data/main.arf | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/parser/data_test.go b/parser/data_test.go
index c7bd803..30739c1 100644
--- a/parser/data_test.go
+++ b/parser/data_test.go
@@ -26,8 +26,8 @@ data ro gIntegerArrayInitialized:Int:16:
 	4785
 	92
 	>
-data wr hIntegerPointerInit:{Int}:<[& integer]>
-data wr iMutIntegerPointerInit:{Int}:mut:<[& integer]>
+data rw hIntegerPointerInit:{Int}:<[& integer]>
+data rw iMutIntegerPointerInit:{Int}:mut:<[& integer]>
 data ro jObject:Obj:
 	(
 	.that:<324>
diff --git a/parser/type-notation.go b/parser/type-notation.go
index 44c6b9a..945a08f 100644
--- a/parser/type-notation.go
+++ b/parser/type-notation.go
@@ -6,10 +6,7 @@ import "git.tebibyte.media/arf/arf/types"
 
 // parseType parses a type notation of the form Name, {Name}, etc.
 func (parser *ParsingOperation) parseType () (what Type, err error) {
-	println("START")
-	defer println("END")
 	err = parser.expect(lexer.TokenKindName, lexer.TokenKindLBrace)
-	println(parser.token.Describe())
 	if err != nil { return }
 	what.location = parser.token.Location()
 
@@ -50,7 +47,7 @@ func (parser *ParsingOperation) parseType () (what Type, err error) {
 		if err != nil { return }
 		err = parser.skipWhitespace()
 		if err != nil { return }
-		
+
 		err = parser.expect(
 			lexer.TokenKindName,
 			lexer.TokenKindUInt,
@@ -71,6 +68,9 @@ func (parser *ParsingOperation) parseType () (what Type, err error) {
 					infoerr.ErrorKindError)
 				return
 			}
+			err = parser.nextToken()
+			if err != nil { return }
+			
 		} else if parser.token.Is(lexer.TokenKindUInt) {
 			// parse fixed array length
 			what.length = parser.token.Value().(uint64)
diff --git a/tests/parser/data/main.arf b/tests/parser/data/main.arf
index f883b6f..824cacd 100644
--- a/tests/parser/data/main.arf
+++ b/tests/parser/data/main.arf
@@ -18,9 +18,9 @@ data ro gIntegerArrayInitialized:Int:16:<
 	340 0 2304 0 4785 92
 	>
 
-data wr hIntegerPointerInit:{Int}:<[& integer]>
+data rw hIntegerPointerInit:{Int}:<[& integer]>
 
-data wr iMutIntegerPointerInit:{Int}:mut:<[& integer]>
+data rw iMutIntegerPointerInit:{Int}:mut:<[& integer]>
 
 data ro jObject:Obj:(
 	.this:<324>