Refactor: Remove superfluous wrapper functions

HBTGmbH · Aug 16, 2022 · f092d8f · f092d8f
1 parent 464ee0e
commit f092d8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/decoder.go b/decoder.go
@@ -419,7 +419,7 @@ func (thiz *decoder) decodeTextSSE(t *Token) (bool, error) {
 		j := thiz.r
 		c := 0
 		for thiz.w > thiz.r+c {
-			sidx := findFirstOpenAngleBracket16(thiz.rb[j+c : thiz.w])
+			sidx := openAngleBracket16(thiz.rb[j+c : thiz.w])
 			onlyWhitespaces = onlyWhitespaces && onlySpacesUntil16(thiz.rb[j+c:thiz.w], sidx)
 			c += int(sidx)
 			if sidx != 16 {
@@ -452,7 +452,7 @@ func (thiz *decoder) decodeTextAVX2(t *Token) (bool, error) {
 		j := thiz.r
 		c := 0
 		for thiz.w > thiz.r+c {
-			sidx := findFirstOpenAngleBracket32(thiz.rb[j+c : thiz.w])
+			sidx := openAngleBracket32(thiz.rb[j+c : thiz.w])
 			onlyWhitespaces = onlyWhitespaces && onlySpacesUntil32(thiz.rb[j+c:thiz.w], sidx)
 			c += int(sidx)
 			if sidx != 32 {

diff --git a/sse_amd64.go b/sse_amd64.go
@@ -3,10 +3,6 @@ package gosaxml
 //go:noescape
 func openAngleBracket16([]uint8) byte
 
-func findFirstOpenAngleBracket16(slice []uint8) byte {
-	return openAngleBracket16(slice)
-}
-
 //go:noescape
 func onlySpaces16([]uint8) byte
 
@@ -17,10 +13,6 @@ func onlySpacesUntil16(slice []uint8, n byte) bool {
 //go:noescape
 func openAngleBracket32([]uint8) byte
 
-func findFirstOpenAngleBracket32(slice []uint8) byte {
-	return openAngleBracket32(slice)
-}
-
 //go:noescape
 func onlySpaces32([]uint8) byte
 

diff --git a/sse_amd64_test.go b/sse_amd64_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 )
 
-func TestFindFirstOpenAngleBracket16(t *testing.T) {
-	assert.Equal(t, byte(3), findFirstOpenAngleBracket16([]uint8{0x20, 0x20, 0x20, 0x3C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20}))
-	assert.Equal(t, byte(16), findFirstOpenAngleBracket16([]uint8{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20}))
+func TestOpenAngleBracket16(t *testing.T) {
+	assert.Equal(t, byte(3), openAngleBracket16([]uint8{0x20, 0x20, 0x20, 0x3C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20}))
+	assert.Equal(t, byte(16), openAngleBracket16([]uint8{0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20}))
 }
 
 func TestOnlySpaces16(t *testing.T) {