diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 3bd11811..7dcdbe15 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -50,15 +50,21 @@ const ( // - RHS: KAssert - // KAssign is "LHS = RHS" or "LHS op= RHS: + // KAssign is "LHS = RHS" or "LHS op= RHS": // - ID0: operator // - LHS: // - RHS: KAssign + // KVar is "var ID1 LHS" or "var ID1 LHS = RHS": + // - ID1: name + // - LHS: + // - RHS: + KVar + // KParam is a "name type" parameter: - // - ID0: name - // - RHS: + // - ID1: name + // - LHS: KParam // KFor is "for { List2 }" or "for LHS { List2 }": @@ -149,6 +155,7 @@ var kindStrings = [...]string{ KStruct: "KStruct", KType: "KType", KUse: "KUse", + KVar: "KVar", } type Flags uint32 diff --git a/lang/check/check.go b/lang/check/check.go index 362d5561..c044b83c 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -135,12 +135,26 @@ func (c *Checker) checkFuncBody(n *a.Node) error { return nil } p := TypeMap{} + + for _, m := range n.List2 { + if err := c.checkVars(m, p); err != nil { + return fmt.Errorf("%v at %s:%d", err, m.Filename, m.Line) + } + } for _, m := range n.List2 { if err := c.checkStatement(m, p); err != nil { return fmt.Errorf("%v at %s:%d", err, m.Filename, m.Line) } } + qid := t.QID{n.ID0, n.ID1} + if _, ok := c.funcs[qid]; ok { + if qid[0] == 0 { + return fmt.Errorf(`check: duplicate function "%s"`, c.idMap.ByID(qid[1])) + } else { + return fmt.Errorf(`check: duplicate function "%s.%s"`, c.idMap.ByID(qid[0]), c.idMap.ByID(qid[1])) + } + } c.funcs[qid] = Func{ QID: qid, Node: n, @@ -149,6 +163,33 @@ func (c *Checker) checkFuncBody(n *a.Node) error { return nil } +func (c *Checker) checkVars(n *a.Node, p TypeMap) error { + if n == nil { + return nil + } + if n.Kind == a.KVar { + if _, ok := p[n.ID1]; ok { + return fmt.Errorf("check: duplicate var %q", c.idMap.ByID(n.ID1)) + } + if err := c.checkType(n.LHS); err != nil { + return err + } + if n.RHS != nil { + // TODO: check that n.RHS doesn't mention the variable itself. + } + p[n.ID1] = n.LHS + return nil + } + for _, l := range [...][]*a.Node{n.List0, n.List1, n.List2} { + for _, m := range l { + if err := c.checkVars(m, p); err != nil { + return err + } + } + } + return nil +} + func (c *Checker) checkStatement(n *a.Node, p TypeMap) error { if n == nil { return nil @@ -164,23 +205,22 @@ func (c *Checker) checkStatement(n *a.Node, p TypeMap) error { return nil case a.KAssign: + if err := c.checkExpr(n.LHS); err != nil { + return err + } if err := c.checkExpr(n.RHS); err != nil { return err } + // TODO: check that n.RHS.Type is assignable to n.LHS.Type. // TODO, look at the op (n.ID0). - if id := isUserDefinedIdent(n.LHS); id != 0 { - if previouslyInferredType, ok := p[id]; ok { - // TODO: check that n.RHS.Type is assignable to previouslyInferredType. - n.LHS.Type = previouslyInferredType - } else { - p[id] = n.RHS.Type - n.LHS.Type = n.RHS.Type - } - } else { - if err := c.checkExpr(n.LHS); err != nil { + return nil + + case a.KVar: + if n.RHS != nil { + if err := c.checkExpr(n.RHS); err != nil { return err } - // TODO: check that n.RHS.Type is assignable to n.LHS.Type. + // TODO: check that n.RHS.Type is assignable to n.LHS. } return nil @@ -379,10 +419,3 @@ var numTypeRanges = [256][2]*big.Int{ } var zero = big.NewInt(0) - -func isUserDefinedIdent(n *a.Node) t.ID { - if n != nil && n.Kind == a.KExpr && n.ID0 == 0 && n.ID1.IsIdent() && !n.ID1.IsBuiltIn() { - return n.ID1 - } - return 0 -} diff --git a/lang/check/check_test.go b/lang/check/check_test.go index 4955c7df..287d5797 100644 --- a/lang/check/check_test.go +++ b/lang/check/check_test.go @@ -17,8 +17,8 @@ func TestCheck(t *testing.T) { const filename = "foo.puffs" const src = ` func bar()() { - x = 1 as u8 - y = 2 as i32 + var x u8 + var y i32 = 2 } ` diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 13ac4433..04a7aba7 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -228,14 +228,14 @@ func (p *parser) parseParam() (*a.Node, error) { if err != nil { return nil, err } - rhs, err := p.parseType() + lhs, err := p.parseType() if err != nil { return nil, err } return &a.Node{ Kind: a.KParam, - ID0: id, - RHS: rhs, + ID1: id, + LHS: lhs, }, nil } @@ -451,6 +451,31 @@ func (p *parser) parseStatement1() (*a.Node, error) { Kind: a.KReturn, LHS: lhs, }, nil + + case t.IDVar: + p.src = p.src[1:] + id, err := p.parseIdent() + if err != nil { + return nil, err + } + lhs, err := p.parseType() + if err != nil { + return nil, err + } + rhs := (*a.Node)(nil) + if p.peekID() == t.IDEq { + p.src = p.src[1:] + rhs, err = p.parseExpr() + if err != nil { + return nil, err + } + } + return &a.Node{ + Kind: a.KVar, + ID1: id, + LHS: lhs, + RHS: rhs, + }, nil } lhs, err := p.parseExpr() diff --git a/lang/token/list.go b/lang/token/list.go index dc20e093..37ad4b8e 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -178,6 +178,7 @@ const ( IDContinue = ID(0x68<> KeyShift: {"continue", IDContinue}, IDStruct >> KeyShift: {"struct", IDStruct}, IDUse >> KeyShift: {"use", IDUse}, + IDVar >> KeyShift: {"var", IDVar}, IDFalse >> KeyShift: {"false", IDFalse}, IDTrue >> KeyShift: {"true", IDTrue}, diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index d6433501..73492b05 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -9,8 +9,8 @@ struct lzw_decoder?( ) func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() { - bits = 0 as u32 - nBits = 0 as u32 + var bits u32 + var nBits u32 // TODO: implement. }