mediocregopher/ginger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix add, clean up main

Browse Source
This commit is contained in:
Brian Picciano 2017-02-12 11:44:10 -07:00
parent 73d81dcbcc
commit 3d02b6a591
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -8,10 +8,15 @@ import (
) )
func main() { func main() {
t := lang.Tuple{vm.Add, lang.Tuple{vm.Tuple, lang.Tuple{ mkcmd := func(a lang.Atom, args ...lang.Term) lang.Tuple {
lang.Tuple{vm.Int, lang.Const("1")}, return lang.Tuple{a, lang.Tuple{vm.Tuple, lang.Tuple(args)}}
lang.Tuple{vm.Int, lang.Const("2")}, }
}}} mkint := func(i string) lang.Tuple {
return lang.Tuple{vm.Int, lang.Const(i)}
}
t := mkcmd(vm.Add, mkint("1"),
mkcmd(vm.Add, mkint("2"), mkint("3")))
mod, err := vm.Build(t) mod, err := vm.Build(t)
if err != nil { if err != nil {

16
vm/cmds.go
View File

@ -20,6 +20,10 @@ type valType struct {
llvm llvm.Type llvm llvm.Type
} }
func (vt valType) isInt() bool {
return lang.Equal(Int, vt.term)
}
// most types don't have an input, so we use this as a shortcut // most types don't have an input, so we use this as a shortcut
type voidIn struct{} type voidIn struct{}
@ -92,7 +96,7 @@ func (tc tupCmd) build(mod *Module) (llvm.Value, error) {
type addCmd struct { type addCmd struct {
voidIn voidIn
a, b intCmd a, b cmd
} }
func (ac addCmd) outType() valType { func (ac addCmd) outType() valType {
@ -166,14 +170,10 @@ func matchCmd(t lang.Term) (cmd, error) {
els, err := vAsTup(2) els, err := vAsTup(2)
if err != nil { if err != nil {
return nil, err return nil, err
} else if _, ok := els[0].(intCmd); !ok { } else if !els[0].outType().isInt() || !els[1].outType().isInt() {
return nil, errors.New("add args must be numbers") return nil, errors.New("add args must be numbers of the same type")
} else if _, ok := els[1].(intCmd); !ok {
return nil, errors.New("add args must be numbers")
} else if !lang.Equal(els[0].outType().term, els[1].outType().term) {
return nil, errors.New("add args must be the same type")
} }
return addCmd{a: els[0].(intCmd), b: els[1].(intCmd)}, nil return addCmd{a: els[0], b: els[1]}, nil
default: default:
return nil, fmt.Errorf("cmd %v unknown, or its args are malformed", t) return nil, fmt.Errorf("cmd %v unknown, or its args are malformed", t)
} }