kamikazechaser/vise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add back handler

Browse Source
This commit is contained in:
lash 2023-03-31 20:05:57 +01:00
parent c3d634c1d3
commit 725ee335ec
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go/vm/vm.go
View File

@ -38,6 +38,8 @@ func Apply(input []byte, instruction []byte, st state.State, rs resource.Fetcher
} }
if sym == "" { if sym == "" {
instruction = NewLine([]byte{}, MOVE, []string{"_catch"}, nil, nil) instruction = NewLine([]byte{}, MOVE, []string{"_catch"}, nil, nil)
} else if sym == "_" {
instruction = NewLine([]byte{}, BACK, nil, nil, nil)
} else { } else {
new_instruction := NewLine([]byte{}, MOVE, []string{sym}, nil, nil) new_instruction := NewLine([]byte{}, MOVE, []string{sym}, nil, nil)
instruction = append(new_instruction, instruction...) instruction = append(new_instruction, instruction...)
@ -80,6 +82,9 @@ func Run(instruction []byte, st state.State, rs resource.Fetcher, ctx context.Co
case MOVE: case MOVE:
st, instruction, err = RunMove(instruction[2:], st, rs, ctx) st, instruction, err = RunMove(instruction[2:], st, rs, ctx)
break break
case BACK:
st, instruction, err = RunBack(instruction[2:], st, rs, ctx)
break
default: default:
err = fmt.Errorf("Unhandled state: %v", op) err = fmt.Errorf("Unhandled state: %v", op)
} }
@ -169,6 +174,11 @@ func RunMove(instruction []byte, st state.State, rs resource.Fetcher, ctx contex
return st, tail, nil return st, tail, nil
} }
func RunBack(instruction []byte, st state.State, rs resource.Fetcher, ctx context.Context) (state.State, []byte, error) {
st.Up()
return st, instruction, nil
}
func refresh(key string, sym []byte, rs resource.Fetcher, ctx context.Context) (string, error) { func refresh(key string, sym []byte, rs resource.Fetcher, ctx context.Context) (string, error) {
fn, err := rs.FuncFor(key) fn, err := rs.FuncFor(key)
if err != nil { if err != nil {

57
go/vm/vm_test.go
View File

@ -250,9 +250,10 @@ func TestRunArgInvalid(t *testing.T) {
func TestRunArgInstructions(t *testing.T) { func TestRunArgInstructions(t *testing.T) {
st := state.NewState(5) st := state.NewState(5)
rs := TestResource{}
rt := router.NewRouter() rt := router.NewRouter()
rt.Add("foo", "bar") rt.Add("foo", "bar")
rs := TestResource{}
b := []byte{0x03} b := []byte{0x03}
b = append(b, []byte("foo")...) b = append(b, []byte("foo")...)
b = append(b, rt.ToBytes()...) b = append(b, rt.ToBytes()...)
@ -284,3 +285,57 @@ func TestRunArgInstructions(t *testing.T) {
} }
_ = r _ = r
} }
func TestRunMoveAndBack(t *testing.T) {
st := state.NewState(5)
rs := TestResource{}
rt := router.NewRouter()
rt.Add("foo", "bar")
b := []byte{0x03}
b = append(b, []byte("foo")...)
b = append(b, rt.ToBytes()...)
bi := NewLine([]byte{}, LOAD, []string{"one"}, nil, []uint8{0})
var err error
st, b, err = Apply(b, bi, st, &rs, context.TODO())
if err != nil {
t.Error(err)
}
l := len(b)
if l != 0 {
t.Errorf("expected empty remainder, got length %v: %v", l, b)
}
rt = router.NewRouter()
rt.Add("foo", "baz")
b = []byte{0x03}
b = append(b, []byte("foo")...)
b = append(b, rt.ToBytes()...)
bi = NewLine([]byte{}, LOAD, []string{"two"}, nil, []uint8{0})
st, b, err = Apply(b, bi, st, &rs, context.TODO())
if err != nil {
t.Error(err)
}
l = len(b)
if l != 0 {
t.Errorf("expected empty remainder, got length %v: %v", l, b)
}
rt = router.NewRouter()
rt.Add("foo", "_")
b = []byte{0x03}
b = append(b, []byte("foo")...)
b = append(b, rt.ToBytes()...)
st, b, err = Apply(b, []byte{}, st, &rs, context.TODO())
if err != nil {
t.Error(err)
}
l = len(b)
if l != 0 {
t.Errorf("expected empty remainder, got length %v: %v", l, b)
}
loc := st.Where()
if loc != "bar" {
t.Errorf("expected where-string 'bar', got %v", loc)
}
}