refactor: Simplify code

romshark · Jan 15, 2022 · c4392a6 · c4392a6
1 parent 1465ebc
commit c4392a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/jscan.go b/jscan.go
@@ -303,8 +303,6 @@ func Validate(s string) Error {
 			}
 			i.expect = expectValOrArrTerm
 
-			i.ValueEnd = -1
-
 			i.KeyStart, i.KeyEnd = -1, -1
 
 			i.st.Push(stack.NodeTypeArray, 0, 0, 0)
@@ -331,16 +329,12 @@ func Validate(s string) Error {
 				i.errCode = ErrorCodeMalformedNumber
 				return i.getError()
 			}
-			i.ValueEnd += i.ValueStart
-
+			i.ValueStart += i.ValueEnd
 			i.KeyStart, i.KeyEnd = -1, -1
-			i.ValueStart = i.ValueEnd
 
 		case '"': // String
-			i.ValueStart++
-			i.ValueEnd = strfind.IndexTerm(s, i.ValueStart)
+			i.ValueEnd = strfind.IndexTerm(s, i.ValueStart+1)
 			if i.ValueEnd < 0 {
-				i.ValueStart--
 				i.errCode = ErrorCodeUnexpectedEOF
 				return i.getError()
 			}
@@ -350,7 +344,6 @@ func Validate(s string) Error {
 				// Array item string value
 				if i.expect != expectValOrArrTerm {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				i.expect = expectCommaOrArrTerm
@@ -359,7 +352,6 @@ func Validate(s string) Error {
 				// String field value
 				if i.expect != expectVal {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				if t != nil {
@@ -376,7 +368,6 @@ func Validate(s string) Error {
 				// Key
 				if i.expect != expectKeyOrObjTerm {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				i.expect = expectVal

diff --git a/jscan_bytes.go b/jscan_bytes.go
@@ -297,8 +297,6 @@ func ValidateBytes(s []byte) ErrorBytes {
 			}
 			i.expect = expectValOrArrTerm
 
-			i.ValueEnd = -1
-
 			i.KeyStart, i.KeyEnd = -1, -1
 
 			i.st.Push(stack.NodeTypeArray, 0, 0, 0)
@@ -325,16 +323,12 @@ func ValidateBytes(s []byte) ErrorBytes {
 				i.errCode = ErrorCodeMalformedNumber
 				return i.getError()
 			}
-			i.ValueEnd += i.ValueStart
-
+			i.ValueStart += i.ValueEnd
 			i.KeyStart, i.KeyEnd = -1, -1
-			i.ValueStart = i.ValueEnd
 
 		case '"': // String
-			i.ValueStart++
-			i.ValueEnd = strfind.IndexTermBytes(s, i.ValueStart)
+			i.ValueEnd = strfind.IndexTermBytes(s, i.ValueStart+1)
 			if i.ValueEnd < 0 {
-				i.ValueStart--
 				i.errCode = ErrorCodeUnexpectedEOF
 				return i.getError()
 			}
@@ -344,7 +338,6 @@ func ValidateBytes(s []byte) ErrorBytes {
 				// Array item string value
 				if i.expect != expectValOrArrTerm {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				i.expect = expectCommaOrArrTerm
@@ -353,7 +346,6 @@ func ValidateBytes(s []byte) ErrorBytes {
 				// String field value
 				if i.expect != expectVal {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				if t != nil {
@@ -370,7 +362,6 @@ func ValidateBytes(s []byte) ErrorBytes {
 				// Key
 				if i.expect != expectKeyOrObjTerm {
 					i.errCode = ErrorCodeUnexpectedToken
-					i.ValueStart--
 					return i.getError()
 				}
 				i.expect = expectVal