Archived
1
0
Fork 0

Simplified some stack stack code

This commit is contained in:
Julien Dessaux 2021-10-22 18:45:54 +02:00
parent 7ef2a61377
commit 9321586129
3 changed files with 6 additions and 6 deletions

View file

@ -201,7 +201,7 @@ proc Eval(p: var Pointer, f: var Field, c: int): (bool, ref int) =
let n = p.ss[].Pop()
let now = now()
let (x, y, lx, ly) = f.GetSize()
let (height, heights) = p.ss[].GetHeights()
let heights = p.ss[].GetHeights()
# 20
for key, value in envPairs():
case key
@ -229,10 +229,10 @@ proc Eval(p: var Pointer, f: var Field, c: int): (bool, ref int) =
for j in countdown(p.argv[i].len-1, 0):
p.ss[].Push(int(p.argv[i][j]))
# 18
for i in 0..<height:
for i in 0..<heights.len:
p.ss[].Push(heights[i])
# 17
p.ss[].Push(height)
p.ss[].Push(heights.len)
# 16
p.ss[].Push(now.hour * 256 * 256 + now.minute * 256 + now.second)
# 15

View file

@ -74,8 +74,8 @@ func Under*(ss: var StackStack): bool =
soss[].Push(ss.Pop())
return false
func GetHeights*(ss: StackStack): (int, seq[int]) =
return (ss.height, ss.head[].GetHeights)
func GetHeights*(ss: StackStack): seq[int] =
return ss.head[].GetHeights
func YCommandPick*(ss: var StackStack, n, h: int) =
ss.head[].YCommandPick(n, h)

View file

@ -148,4 +148,4 @@ suite "StackStack":
check empty[].Pop() == 6
test "GetHeights":
var empty = NewStackStack()
check empty[].GetHeights == (1, @[0])
check empty[].GetHeights == @[0]