From cbe19f50e08856fb438756ac3a75aed6cc92e2ac Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 27 Dec 2018 11:19:22 +1100 Subject: [PATCH] Restrict var statements to the top of functions --- cmd/wuffs-c/internal/cgen/resume.go | 15 +++------ doc/changelog.md | 1 + lang/check/check.go | 4 +-- lang/check/type.go | 50 +++++++---------------------- lang/parse/parse.go | 22 ++++++++++--- 5 files changed, 36 insertions(+), 56 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/resume.go b/cmd/wuffs-c/internal/cgen/resume.go index e1922edf..5b0fd6fb 100644 --- a/cmd/wuffs-c/internal/cgen/resume.go +++ b/cmd/wuffs-c/internal/cgen/resume.go @@ -150,17 +150,12 @@ func (g *gen) findVars() error { } f := g.currFunk.astFunc - if err := f.AsNode().Walk(func(n *a.Node) error { - if n.Kind() == a.KVar { - name := n.AsVar().Name() - if _, ok := h.vars[name]; !ok { - g.currFunk.varList = append(g.currFunk.varList, n.AsVar()) - h.vars[name] = len(h.vars) - } + for _, n := range f.Body() { + if n.Kind() != a.KVar { + break } - return nil - }); err != nil { - return err + g.currFunk.varList = append(g.currFunk.varList, n.AsVar()) + h.vars[n.AsVar().Name()] = len(h.vars) } if f.Effect().Coroutine() { diff --git a/doc/changelog.md b/doc/changelog.md index 6d0b48a0..76d1a412 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -11,6 +11,7 @@ - Added a `use` keyword. - Added a `yield` keyword. - Made the `return` value mandatory; added `ok` literal. +- Restricted `var` statements to the top of functions. - Changed func out-type from struct to bare type. - Renamed the implicit `in` variable to `args`. - Added `std/adler32`, `std/crc32` and `std/gzip`. diff --git a/lang/check/check.go b/lang/check/check.go index bf0ad0d7..53a216cf 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -540,9 +540,7 @@ func (c *Checker) checkFuncBody(node *a.Node) error { localVars: c.localVars[n.QQID()], } - // Fill in the TypeMap with all local variables. Note that they have - // function scope and can be hoisted, JavaScript style, a la - // https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Statements/var + // Fill in the TypeMap with all local variables. if err := q.tcheckVars(n.Body()); err != nil { return &Error{ Err: err, diff --git a/lang/check/type.go b/lang/check/type.go index 501d4883..bdfc2753 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -24,47 +24,21 @@ import ( func (q *checker) tcheckVars(block []*a.Node) error { for _, o := range block { + if o.Kind() != a.KVar { + break + } + q.errFilename, q.errLine = o.AsRaw().FilenameLine() - switch o.Kind() { - case a.KIf: - for o := o.AsIf(); o != nil; o = o.ElseIf() { - if err := q.tcheckVars(o.BodyIfTrue()); err != nil { - return err - } - if err := q.tcheckVars(o.BodyIfFalse()); err != nil { - return err - } - } - - case a.KIOBind: - if err := q.tcheckVars(o.AsIOBind().Body()); err != nil { - return err - } - - case a.KIterate: - for o := o.AsIterate(); o != nil; o = o.ElseIterate() { - if err := q.tcheckVars(o.Body()); err != nil { - return err - } - } - - case a.KVar: - o := o.AsVar() - name := o.Name() - if _, ok := q.localVars[name]; ok { - return fmt.Errorf("check: duplicate var %q", name.Str(q.tm)) - } - if err := q.tcheckTypeExpr(o.XType(), 0); err != nil { - return err - } - q.localVars[name] = o.XType() - - case a.KWhile: - if err := q.tcheckVars(o.AsWhile().Body()); err != nil { - return err - } + o := o.AsVar() + name := o.Name() + if _, ok := q.localVars[name]; ok { + return fmt.Errorf("check: duplicate var %q", name.Str(q.tm)) } + if err := q.tcheckTypeExpr(o.XType(), 0); err != nil { + return err + } + q.localVars[name] = o.XType() } return nil } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 7bfd33e2..8519e559 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -71,6 +71,7 @@ type parser struct { opts Options lastLine uint32 funcEffect a.Effect + allowVar bool } func (p *parser) line() uint32 { @@ -195,10 +196,14 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { return nil, err } } + + p.allowVar = true body, err := p.parseBlock() if err != nil { return nil, err } + p.allowVar = false + if x := p.peek1(); x != t.IDSemicolon { got := p.tm.ByID(x) return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) @@ -575,7 +580,18 @@ func (p *parser) parseLabel() (t.ID, error) { } func (p *parser) parseStatement1() (*a.Node, error) { - switch x := p.peek1(); x { + x := p.peek1() + if x == t.IDVar { + if !p.allowVar { + return nil, fmt.Errorf(`parse: var statement not at the top of a function at %s:%d`, + p.filename, p.line()) + } + p.src = p.src[1:] + return p.parseVarNode() + } + p.allowVar = false + + switch x { case t.IDAssert, t.IDPre, t.IDPost: return p.parseAssertNode() @@ -608,10 +624,6 @@ func (p *parser) parseStatement1() (*a.Node, error) { } return a.NewRet(x, value).AsNode(), nil - case t.IDVar: - p.src = p.src[1:] - return p.parseVarNode() - case t.IDWhile: p.src = p.src[1:] label, err := p.parseLabel()