cco/go-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forge: control words: factorial ok, with if, leave, repeat

Browse source
This commit is contained in:
Helmut Merz 2023-09-12 12:59:52 +02:00
parent 75b82db250
commit 1f45c625e9
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
forge/builtins/builtins.go
View file

@ -1,6 +1,8 @@
package builtins package builtins
import ( import (
"fmt"
"git.sr.ht/~cco/go-scopes/forge" "git.sr.ht/~cco/go-scopes/forge"
) )
@ -9,7 +11,7 @@ type XT = forge.XT
type FPtr = forge.FPtr type FPtr = forge.FPtr
type builtins struct { type builtins struct {
Add, Body, Code, Comp, Drop, Dup, Get, If, IfElse, Leave, LT, Lit, Add, Body, Code, Comp, Do, Dot, Drop, Dup, Get, If, IfElse, Leave, LT, Lit,
Mult, New1, Over, Put, Reg, Repeat, Sub, Swap, Mult, New1, Over, Put, Reg, Repeat, Sub, Swap,
Var1 XT Var1 XT
} }
@ -33,6 +35,8 @@ func setup(f FE) *builtins {
Body: r("body", func(f FE, _ XT) { f.Push(f.Pop().(XT).Code().New().Next()) }), Body: r("body", func(f FE, _ XT) { f.Push(f.Pop().(XT).Code().New().Next()) }),
Code: r("code", func(f FE, _ XT) { f.Push(f.Code()) }), Code: r("code", func(f FE, _ XT) { f.Push(f.Code()) }),
Comp: r("comp", func(f FE, _ XT) { f.LatestXT().Code().Append(f.Pop()) }), Comp: r("comp", func(f FE, _ XT) { f.LatestXT().Code().Append(f.Pop()) }),
Do: r("do", func(f FE, _ XT) { f.Call(f.Literal().(FPtr)) }),
Dot: r(".", func(f FE, _ XT) { fmt.Println(f.Peek(0)) }),
Drop: r("drop", func(f FE, _ XT) { f.Pop() }), Drop: r("drop", func(f FE, _ XT) { f.Pop() }),
Dup: r("dup", func(f FE, _ XT) { f.Push(f.Peek(0)) }), Dup: r("dup", func(f FE, _ XT) { f.Push(f.Peek(0)) }),
Get: r("@", func(f FE, _ XT) { f.Push(f.Pop().(FPtr).Value()) }), Get: r("@", func(f FE, _ XT) { f.Push(f.Pop().(FPtr).Value()) }),

3
forge/forge.go
View file

@ -105,8 +105,11 @@ func (f *forgeEnv) Peek(d int) fitem {
} }
func (f *forgeEnv) RPop() fptr { func (f *forgeEnv) RPop() fptr {
if f.rs.Depth() > 0 {
return f.rs.Pop().(fptr) return f.rs.Pop().(fptr)
} }
return f.Code()
}
func (f *forgeEnv) Reset() fptr { func (f *forgeEnv) Reset() fptr {
return f.ip.Reset() return f.ip.Reset()

10
tests/forge_test.go
View file

@ -47,13 +47,15 @@ func CoreTest(t *testing.T) {
func ControlTest(t *testing.T) { func ControlTest(t *testing.T) {
fac := fe.Exec(fe.Code( fac := fe.Exec(fe.Code(
b.Dup, fe.Code( b.Dup, b.Do, fe.Code(
b.Dup, 3, b.LT, b.If, fe.Code( b.Dup, 3, b.LT, b.If, fe.Code(
b.Drop, b.Leave), b.Drop, b.Leave),
b.Swap, b.Over, b.Mult, b.Swap, 1, b.Sub, b.Repeat)), 1, b.Sub, b.Swap, b.Over, b.Mult, b.Swap, b.Repeat)),
"fac", b.Reg).LatestXT() "fac", b.Reg).LatestXT()
fe.Exec(2, fac) t.AssertEqual(fe.Exec(1, fac).Pop(), 1)
//t.AssertEqual(fe.Pop(), 12) t.AssertEqual(fe.Exec(2, fac).Pop(), 2)
t.AssertEqual(fe.Exec(3, fac).Pop(), 6)
t.AssertEqual(fe.Exec(4, fac).Pop(), 24)
} }
func RepTest(t *testing.T) { func RepTest(t *testing.T) {