mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Restrict var statements to the top of functions
This commit is contained in:
1 parent
84f9d3a915
commit
cbe19f50e0
5 files changed
+36
-56
No files matched your search
@@ -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() {
|
||||
|
||||
@@ -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`.
|
||||
|
||||
+1
-3
@@ -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,
|
||||
|
||||
+12
-38
@@ -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
|
||||
}
|
||||
|
||||
+17
-5
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user