diff --git a/lang/ast/ast.go b/lang/ast/ast.go index ce896a59..49c102b2 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -380,6 +380,7 @@ type TypeExpr Node func (n *TypeExpr) Node() *Node { return (*Node)(n) } func (n *TypeExpr) IsNumType() bool { return n.id0 == 0 && n.id1.IsNumType() } +func (n *TypeExpr) IsRefined() bool { return n.id0 != t.IDOpenBracket && (n.lhs != nil || n.mhs != nil) } func (n *TypeExpr) PackageOrDecorator() t.ID { return n.id0 } func (n *TypeExpr) Name() t.ID { return n.id1 } func (n *TypeExpr) ArrayLength() *Expr { return n.lhs.Expr() } diff --git a/lang/check/bounds.go b/lang/check/bounds.go new file mode 100644 index 00000000..b25befbd --- /dev/null +++ b/lang/check/bounds.go @@ -0,0 +1,120 @@ +// Use of this source code is governed by a BSD-style license that can be found +// in the LICENSE file. + +package check + +import ( + "fmt" + "math/big" + + a "github.com/google/puffs/lang/ast" + t "github.com/google/puffs/lang/token" +) + +var numTypeBounds = [256][2]*big.Int{ + t.IDI8 >> t.KeyShift: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, + t.IDI16 >> t.KeyShift: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, + t.IDI32 >> t.KeyShift: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, + t.IDI64 >> t.KeyShift: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, + t.IDU8 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, + t.IDU16 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, + t.IDU32 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, + t.IDU64 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, + t.IDUsize >> t.KeyShift: {zero, zero}, +} + +var ( + zero = big.NewInt(0) + one = big.NewInt(1) + ffff = big.NewInt(0xFFFF) +) + +func btoi(b bool) *big.Int { + if b { + return one + } + return zero +} + +func (c *typeChecker) bcheckStatement(n *a.Node) error { + c.errFilename, c.errLine = n.Raw().FilenameLine() + + switch n.Kind() { + case a.KAssert: + // TODO. + + case a.KAssign: + // TODO. + + case a.KVar: + o := n.Var() + return c.bcheckAssignment(o.XType(), o.Value()) + + case a.KWhile: + // TODO. + + case a.KIf: + // TODO. + + case a.KReturn: + // TODO. + + case a.KJump: + // No-op. + + default: + return fmt.Errorf("check: unrecognized ast.Kind (%d) for checkStatement", n.Kind()) + } + + return nil +} + +func (c *typeChecker) bcheckAssignment(lTyp *a.TypeExpr, rhs *a.Expr) error { + switch lTyp.PackageOrDecorator() { + case t.IDPtr: + // TODO: handle. + return nil + case t.IDOpenBracket: + // TODO: handle. + return nil + } + if lTyp.Name() == t.IDBool { + return nil + } + + bounds := [2]*big.Int{} + if key := lTyp.Name().Key(); key < t.Key(len(numTypeBounds)) { + bounds = numTypeBounds[key] + } + if bounds[0] == nil || bounds[1] == nil { + return fmt.Errorf("check: internal error: unknown bounds for %q", lTyp.String(c.idMap)) + } + + if lTyp.IsRefined() { + if x := lTyp.InclMin(); x != nil { + if cv := x.ConstValue(); cv != nil && bounds[0].Cmp(cv) < 0 { + bounds[0] = cv + } + } + if x := lTyp.ExclMax(); x != nil { + if cv := x.ConstValue(); cv != nil && bounds[1].Cmp(cv) > 0 { + bounds[1] = big.NewInt(0).Sub(cv, one) + } + } + } + + cv := zero + if rhs != nil { + cv = rhs.ConstValue() + } + if cv != nil { + if cv.Cmp(bounds[0]) >= 0 && cv.Cmp(bounds[1]) <= 0 { + return nil + } + return fmt.Errorf("check: cannot prove constant %v within bounds [%v..%v]", + cv, bounds[0], bounds[1]) + } + + return fmt.Errorf("check: cannot prove expression %q within bounds [%v..%v]", + rhs.String(c.idMap), bounds[0], bounds[1]) +} diff --git a/lang/check/check.go b/lang/check/check.go index 5b096b10..ae638ccf 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -6,7 +6,6 @@ package check import ( "errors" "fmt" - "math/big" a "github.com/google/puffs/lang/ast" t "github.com/google/puffs/lang/token" @@ -117,6 +116,7 @@ func (c *Checker) checkFields(fields []*a.Node) error { if len(fields) == 0 { return nil } + tc := &typeChecker{ c: c, idMap: c.idMap, @@ -133,6 +133,9 @@ func (c *Checker) checkFields(fields []*a.Node) error { fieldNames[f.Name()] = true f.Node().SetTypeChecked() } + + // TODO: bounds checking. + return nil } @@ -274,8 +277,18 @@ func (c *Checker) checkFuncBody(n *a.Node) error { } } - f.Node().SetTypeChecked() + // Run bounds checks. + for _, m := range f.Body() { + if err := tc.bcheckStatement(m); err != nil { + return &Error{ + Err: err, + Filename: tc.errFilename, + Line: tc.errLine, + } + } + } + f.Node().SetTypeChecked() if err := f.Node().Walk(func(n *a.Node) error { if !n.TypeChecked() { return fmt.Errorf("check: internal error: unchecked %s node", n.Kind()) @@ -295,34 +308,5 @@ func (c *Checker) checkFuncBody(n *a.Node) error { return err } - // TODO: bounds and assertion checking. - return nil } - -// TODO: use numTypeRanges. - -var numTypeRanges = [256][2]*big.Int{ - t.IDI8 >> t.KeyShift: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)}, - t.IDI16 >> t.KeyShift: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)}, - t.IDI32 >> t.KeyShift: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)}, - t.IDI64 >> t.KeyShift: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)}, - t.IDU8 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<8 - 1)}, - t.IDU16 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<16 - 1)}, - t.IDU32 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, - t.IDU64 >> t.KeyShift: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, - t.IDUsize >> t.KeyShift: {zero, zero}, -} - -var ( - zero = big.NewInt(0) - one = big.NewInt(1) - ffff = big.NewInt(0xFFFF) -) - -func btoi(b bool) *big.Int { - if b { - return one - } - return zero -} diff --git a/lang/check/type.go b/lang/check/type.go index 30dbd32e..c01f5647 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -551,6 +551,11 @@ func (c *typeChecker) checkTypeExpr(n *a.TypeExpr, depth uint32) error { } default: + // TODO: delete this hack. + if n.PackageOrDecorator() == c.idMap.ByName("io") && n.Name() == c.idMap.ByName("buf1") { + break + } + return fmt.Errorf("check: unrecognized node for checkTypeExpr") } n.Node().SetTypeChecked() diff --git a/lang/token/token.go b/lang/token/token.go index 539b90f4..42e26595 100644 --- a/lang/token/token.go +++ b/lang/token/token.go @@ -51,6 +51,9 @@ func (m *IDMap) insert(name string) (ID, error) { } func (m *IDMap) ByName(name string) ID { + if id, ok := builtInsByName[name]; ok { + return id + } if m.byName != nil { return m.byName[name] } diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index 73492b05..bde9e8d0 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -12,5 +12,9 @@ func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() { var bits u32 var nBits u32 + // TODO: set clear_code, end_code, etc. + + var width u32[:13] = 12 + // TODO: implement. }