Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix infinite loop on PrintIndented #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix infinite loop on PrintIndented #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bed1fc
Fix infinte loop
MrMarble Dec 31, 2020
d58fe64
Go fmt
MrMarble Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nbt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func printIndented(w io.Writer, p Tag, prefix interface{}, indent int) {
fmt.Fprintf(w, "[%d %v list] {", length, x.Contents)
if length != 0 {
fmt.Fprintf(w, "\n")
x.Iterate(func(i int, t Tag) error { printIndented(w, p, i, indent+1); return nil })
x.Iterate(func(i int, t Tag) error { printIndented(w, t, i, indent+1); return nil })
}
fmt.Fprintf(w, "%*s}", indent*2, "")
case Compound:
Expand Down
66 changes: 26 additions & 40 deletions typegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func MakeByteList(in []Byte) (l List) {
return l
}


// Short represents the NBT type TAG_Short
// Type() tells you that Short represents TypeShort.
func (Short) Type() Type { return TypeShort }
Expand Down Expand Up @@ -85,7 +84,6 @@ func MakeShortList(in []Short) (l List) {
return l
}


// Int represents the NBT type TAG_Int
// Type() tells you that Int represents TypeInt.
func (Int) Type() Type { return TypeInt }
Expand Down Expand Up @@ -119,7 +117,6 @@ func MakeIntList(in []Int) (l List) {
return l
}


// Long represents the NBT type TAG_Long
// Type() tells you that Long represents TypeLong.
func (Long) Type() Type { return TypeLong }
Expand Down Expand Up @@ -153,7 +150,6 @@ func MakeLongList(in []Long) (l List) {
return l
}


// Float represents the NBT type TAG_Float
// Type() tells you that Float represents TypeFloat.
func (Float) Type() Type { return TypeFloat }
Expand Down Expand Up @@ -187,7 +183,6 @@ func MakeFloatList(in []Float) (l List) {
return l
}


// Double represents the NBT type TAG_Double
// Type() tells you that Double represents TypeDouble.
func (Double) Type() Type { return TypeDouble }
Expand Down Expand Up @@ -221,7 +216,6 @@ func MakeDoubleList(in []Double) (l List) {
return l
}


// ByteArray represents the NBT type TAG_ByteArray
// Type() tells you that ByteArray represents TypeByteArray.
func (ByteArray) Type() Type { return TypeByteArray }
Expand Down Expand Up @@ -255,7 +249,6 @@ func MakeByteArrayList(in []ByteArray) (l List) {
return l
}


// String represents the NBT type TAG_String
// Type() tells you that String represents TypeString.
func (String) Type() Type { return TypeString }
Expand Down Expand Up @@ -289,7 +282,6 @@ func MakeStringList(in []String) (l List) {
return l
}


// List represents the NBT type TAG_List
// Type() tells you that List represents TypeList.
func (List) Type() Type { return TypeList }
Expand Down Expand Up @@ -323,7 +315,6 @@ func MakeListList(in []List) (l List) {
return l
}


// Compound represents the NBT type TAG_Compound
// Type() tells you that Compound represents TypeCompound.
func (Compound) Type() Type { return TypeCompound }
Expand Down Expand Up @@ -357,7 +348,6 @@ func MakeCompoundList(in []Compound) (l List) {
return l
}


// IntArray represents the NBT type TAG_IntArray
// Type() tells you that IntArray represents TypeIntArray.
func (IntArray) Type() Type { return TypeIntArray }
Expand Down Expand Up @@ -391,7 +381,6 @@ func MakeIntArrayList(in []IntArray) (l List) {
return l
}


// LongArray represents the NBT type TAG_LongArray
// Type() tells you that LongArray represents TypeLongArray.
func (LongArray) Type() Type { return TypeLongArray }
Expand Down Expand Up @@ -425,9 +414,6 @@ func MakeLongArrayList(in []LongArray) (l List) {
return l
}




func (l List) storeData(w io.Writer) (err error) {
switch raw := l.data.(type) {

Expand Down Expand Up @@ -561,7 +547,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Byte, count)
for i := 0; i < count; i++ {
raw[i], err = loadByte(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -573,7 +559,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Short, count)
for i := 0; i < count; i++ {
raw[i], err = loadShort(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -585,7 +571,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Int, count)
for i := 0; i < count; i++ {
raw[i], err = loadInt(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -597,7 +583,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Long, count)
for i := 0; i < count; i++ {
raw[i], err = loadLong(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -609,7 +595,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Float, count)
for i := 0; i < count; i++ {
raw[i], err = loadFloat(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -621,7 +607,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Double, count)
for i := 0; i < count; i++ {
raw[i], err = loadDouble(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -633,7 +619,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]ByteArray, count)
for i := 0; i < count; i++ {
raw[i], err = loadByteArray(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -645,7 +631,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]String, count)
for i := 0; i < count; i++ {
raw[i], err = loadString(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -657,7 +643,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]List, count)
for i := 0; i < count; i++ {
raw[i], err = loadList(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -669,7 +655,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]Compound, count)
for i := 0; i < count; i++ {
raw[i], err = loadCompound(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -681,7 +667,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]IntArray, count)
for i := 0; i < count; i++ {
raw[i], err = loadIntArray(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand All @@ -693,7 +679,7 @@ func (l *List) loadData(r io.Reader, count int) (err error) {
raw := make([]LongArray, count)
for i := 0; i < count; i++ {
raw[i], err = loadLongArray(r)
if err!= nil {
if err != nil {
raw = raw[:i]
break
}
Expand Down Expand Up @@ -724,7 +710,7 @@ func (l List) Iterate(fn func(int, Tag) error) (err error) {
case []Byte:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -733,7 +719,7 @@ err = fn(i, raw[i])
case []Short:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -742,7 +728,7 @@ err = fn(i, raw[i])
case []Int:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -751,7 +737,7 @@ err = fn(i, raw[i])
case []Long:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -760,7 +746,7 @@ err = fn(i, raw[i])
case []Float:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -769,7 +755,7 @@ err = fn(i, raw[i])
case []Double:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -778,7 +764,7 @@ err = fn(i, raw[i])
case []ByteArray:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -787,7 +773,7 @@ err = fn(i, raw[i])
case []String:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -796,7 +782,7 @@ err = fn(i, raw[i])
case []List:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -805,7 +791,7 @@ err = fn(i, raw[i])
case []Compound:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -814,7 +800,7 @@ err = fn(i, raw[i])
case []IntArray:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand All @@ -823,7 +809,7 @@ err = fn(i, raw[i])
case []LongArray:
count := len(raw)
for i := 0; i < count; i++ {
err = fn(i, raw[i])
err = fn(i, raw[i])

if err != nil {
break
Expand Down Expand Up @@ -893,7 +879,7 @@ func (l List) Length() int {
return len(raw)

default:
return 0
return 0
}
}

Expand Down Expand Up @@ -962,7 +948,7 @@ func MakeList(in interface{}) (l List, err error) {
}

// Element gives the ith element of l.
func (l List)Element(i int) (out Tag, ok bool) {
func (l List) Element(i int) (out Tag, ok bool) {
switch data := l.data.(type) {

case []End:
Expand Down