go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-11-06 08:39:09 +02:00
Code Issues Releases Activity

Fix increment-decrement errors

Browse Source
This commit is contained in:
David Landry
2018-10-05 17:01:54 -04:00
parent a7f8443d7d
commit 31cb7c2762
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/runtime/collections/iterator.go
View File

@@ -128,7 +128,7 @@ func (iterator *SliceIterator) Next() (core.Value, core.Value, error) {
if len(iterator.values) > iterator.pos { if len(iterator.values) > iterator.pos {
idx := iterator.pos idx := iterator.pos
val := iterator.values[idx] val := iterator.values[idx]
iterator.pos += 1 iterator.pos++
return val, values.NewInt(idx), nil return val, values.NewInt(idx), nil
} }
@@ -148,7 +148,7 @@ func (iterator *MapIterator) HasNext() bool {
i := 0 i := 0
for k := range iterator.values { for k := range iterator.values {
keys[i] = k keys[i] = k
i += 1 i++
} }
iterator.keys = keys iterator.keys = keys
@@ -161,7 +161,7 @@ func (iterator *MapIterator) Next() (core.Value, core.Value, error) {
if len(iterator.keys) > iterator.pos { if len(iterator.keys) > iterator.pos {
key := iterator.keys[iterator.pos] key := iterator.keys[iterator.pos]
val := iterator.values[key] val := iterator.values[key]
iterator.pos += 1 iterator.pos++
return val, values.NewString(key), nil return val, values.NewString(key), nil
} }
@@ -181,7 +181,7 @@ func (iterator *ArrayIterator) Next() (core.Value, core.Value, error) {
if int(iterator.values.Length()) > iterator.pos { if int(iterator.values.Length()) > iterator.pos {
idx := iterator.pos idx := iterator.pos
val := iterator.values.Get(values.NewInt(idx)) val := iterator.values.Get(values.NewInt(idx))
iterator.pos += 1 iterator.pos++
return val, values.NewInt(idx), nil return val, values.NewInt(idx), nil
} }
@@ -206,7 +206,7 @@ func (iterator *ObjectIterator) Next() (core.Value, core.Value, error) {
if len(iterator.keys) > iterator.pos { if len(iterator.keys) > iterator.pos {
key := iterator.keys[iterator.pos] key := iterator.keys[iterator.pos]
val, _ := iterator.values.Get(values.NewString(key)) val, _ := iterator.values.Get(values.NewString(key))
iterator.pos += 1 iterator.pos++
return val, values.NewString(key), nil return val, values.NewString(key), nil
} }
@@ -227,7 +227,7 @@ func (iterator *HTMLNodeIterator) Next() (core.Value, core.Value, error) {
idx := iterator.pos idx := iterator.pos
val := iterator.values.GetChildNode(values.NewInt(idx)) val := iterator.values.GetChildNode(values.NewInt(idx))
iterator.pos += 1 iterator.pos++
return val, values.NewInt(idx), nil return val, values.NewInt(idx), nil
} }

4
pkg/runtime/collections/limit.go
View File

@@ -32,7 +32,7 @@ func (i *LimitIterator) HasNext() bool {
func (i *LimitIterator) Next() (core.Value, core.Value, error) { func (i *LimitIterator) Next() (core.Value, core.Value, error) {
if i.counter() <= i.count { if i.counter() <= i.count {
i.currCount += 1 i.currCount++
return i.src.Next() return i.src.Next()
} }
@@ -54,7 +54,7 @@ func (i *LimitIterator) verifyOffset() {
} }
for (i.offset > i.currCount) && i.src.HasNext() { for (i.offset > i.currCount) && i.src.HasNext() {
i.currCount += 1 i.currCount++
i.src.Next() i.src.Next()
} }
} }

4
pkg/runtime/values/helpers.go
View File

@@ -226,7 +226,7 @@ func Parse(input interface{}) core.Value {
size := v.Len() size := v.Len()
arr := NewArray(size) arr := NewArray(size)
for i := 0; i < size; i += 1 { for i := 0; i < size; i++ {
value := v.Index(i) value := v.Index(i)
arr.Push(Parse(value.Interface())) arr.Push(Parse(value.Interface()))
} }
@@ -252,7 +252,7 @@ func Parse(input interface{}) core.Value {
obj := NewObject() obj := NewObject()
size := t.NumField() size := t.NumField()
for i := 0; i < size; i += 1 { for i := 0; i < size; i++ {
field := t.Field(i) field := t.Field(i)
value := v.Field(i) value := v.Field(i)