From d32344051148ce6dd7a7f593da28aa21d90421d4 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 20 May 2017 12:58:36 +1000 Subject: [PATCH] Rename some "m, n, o" variables for consistency. --- lang/ast/ast.go | 8 ++-- lang/check/bounds.go | 36 +++++++------- lang/check/check.go | 112 +++++++++++++++++++++---------------------- lang/check/type.go | 64 ++++++++++++------------- 4 files changed, 110 insertions(+), 110 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 5beb262c..cc4f4069 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -117,14 +117,14 @@ func (n *Node) Walk(f func(*Node) error) error { if err := f(n); err != nil { return err } - for _, m := range n.Raw().SubNodes() { - if err := m.Walk(f); err != nil { + for _, o := range n.Raw().SubNodes() { + if err := o.Walk(f); err != nil { return err } } for _, l := range n.Raw().SubLists() { - for _, m := range l { - if err := m.Walk(f); err != nil { + for _, o := range l { + if err := o.Walk(f); err != nil { return err } } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 197588e4..ca7bb386 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -53,12 +53,12 @@ func (q *checker) bcheckStatement(n *a.Node) error { switch n.Kind() { case a.KAssert: - o := n.Assert() - condition := o.Condition() + n := n.Assert() + condition := n.Condition() err := errFailed - if reasonID := o.Reason(); reasonID != 0 { + if reasonID := n.Reason(); reasonID != 0 { if reasonFunc := q.reasonMap[reasonID.Key()]; reasonFunc != nil { - err = reasonFunc(q, o) + err = reasonFunc(q, n) } else { err = fmt.Errorf("no such reason %s", reasonID.String(q.idMap)) } @@ -76,12 +76,12 @@ func (q *checker) bcheckStatement(n *a.Node) error { q.facts.appendFact(condition) case a.KAssign: - o := n.Assign() - return q.bcheckAssignment(o.LHS(), o.LHS().MType(), o.Operator(), o.RHS()) + n := n.Assign() + return q.bcheckAssignment(n.LHS(), n.LHS().MType(), n.Operator(), n.RHS()) case a.KVar: - o := n.Var() - return q.bcheckAssignment(nil, o.XType(), t.IDEq, o.Value()) + n := n.Var() + return q.bcheckAssignment(nil, n.XType(), t.IDEq, n.Value()) case a.KWhile: return q.bcheckWhile(n.While()) @@ -167,8 +167,8 @@ func (q *checker) bcheckWhile(n *a.While) error { } // Check the pre and assert conditions on entry. - for _, m := range n.Asserts() { - if m.Assert().Keyword().Key() == t.KeyPost { + for _, o := range n.Asserts() { + if o.Assert().Keyword().Key() == t.KeyPost { continue } // TODO @@ -177,15 +177,15 @@ func (q *checker) bcheckWhile(n *a.While) error { // Assume the pre and assert conditions, and the while condition. Check // the body. q.facts = q.facts[:0] - for _, m := range n.Asserts() { - if m.Assert().Keyword().Key() == t.KeyPost { + for _, o := range n.Asserts() { + if o.Assert().Keyword().Key() == t.KeyPost { continue } - q.facts.appendFact(m.Assert().Condition()) + q.facts.appendFact(o.Assert().Condition()) } q.facts.appendFact(n.Condition()) - for _, m := range n.Body() { - if err := q.bcheckStatement(m); err != nil { + for _, o := range n.Body() { + if err := q.bcheckStatement(o); err != nil { return err } } @@ -194,11 +194,11 @@ func (q *checker) bcheckWhile(n *a.While) error { // Assume the assert and post conditions. q.facts = q.facts[:0] - for _, m := range n.Asserts() { - if m.Assert().Keyword().Key() == t.KeyPre { + for _, o := range n.Asserts() { + if o.Assert().Keyword().Key() == t.KeyPre { continue } - q.facts.appendFact(m.Assert().Condition()) + q.facts.appendFact(o.Assert().Condition()) } return nil } diff --git a/lang/check/check.go b/lang/check/check.go index e21a3f87..6699128b 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -131,7 +131,7 @@ type Checker struct { func (c *Checker) Funcs() map[t.QID]Func { return c.funcs } -func (c *Checker) checkUse(n *a.Node) error { +func (c *Checker) checkUse(node *a.Node) error { // TODO. return nil } @@ -163,66 +163,66 @@ func (c *Checker) checkFields(fields []*a.Node) error { return nil } -func (c *Checker) checkStruct(n *a.Node) error { - s := n.Struct() - if err := c.checkFields(s.Fields()); err != nil { +func (c *Checker) checkStruct(node *a.Node) error { + n := node.Struct() + if err := c.checkFields(n.Fields()); err != nil { return &Error{ - Err: fmt.Errorf("%v in struct %q", err, c.idMap.ByID(s.Name())), - Filename: s.Filename(), - Line: s.Line(), + Err: fmt.Errorf("%v in struct %q", err, c.idMap.ByID(n.Name())), + Filename: n.Filename(), + Line: n.Line(), } } - id := s.Name() + id := n.Name() if other, ok := c.structs[id]; ok { return &Error{ Err: fmt.Errorf("check: duplicate struct %q", c.idMap.ByID(id)), - Filename: s.Filename(), - Line: s.Line(), + Filename: n.Filename(), + Line: n.Line(), OtherFilename: other.Struct.Filename(), OtherLine: other.Struct.Line(), } } c.structs[id] = Struct{ ID: id, - Struct: s, + Struct: n, } - s.Node().SetTypeChecked() + n.Node().SetTypeChecked() return nil } -func (c *Checker) checkFuncSignature(n *a.Node) error { - f := n.Func() - if err := c.checkFields(f.In().Fields()); err != nil { +func (c *Checker) checkFuncSignature(node *a.Node) error { + n := node.Func() + if err := c.checkFields(n.In().Fields()); err != nil { return &Error{ - Err: fmt.Errorf("%v in in-params for func %q", err, c.idMap.ByID(f.Name())), - Filename: f.Filename(), - Line: f.Line(), + Err: fmt.Errorf("%v in in-params for func %q", err, c.idMap.ByID(n.Name())), + Filename: n.Filename(), + Line: n.Line(), } } - f.In().Node().SetTypeChecked() - if err := c.checkFields(f.Out().Fields()); err != nil { + n.In().Node().SetTypeChecked() + if err := c.checkFields(n.Out().Fields()); err != nil { return &Error{ - Err: fmt.Errorf("%v in out-params for func %q", err, c.idMap.ByID(f.Name())), - Filename: f.Filename(), - Line: f.Line(), + Err: fmt.Errorf("%v in out-params for func %q", err, c.idMap.ByID(n.Name())), + Filename: n.Filename(), + Line: n.Line(), } } - f.Out().Node().SetTypeChecked() + n.Out().Node().SetTypeChecked() - qid := f.QID() + qid := n.QID() if other, ok := c.funcs[qid]; ok { return &Error{ Err: fmt.Errorf("check: duplicate function %q", qid.String(c.idMap)), - Filename: f.Filename(), - Line: f.Line(), + Filename: n.Filename(), + Line: n.Line(), OtherFilename: other.Func.Filename(), OtherLine: other.Func.Line(), } } - inTyp := a.NewTypeExpr(0, f.In().Name(), nil, nil, nil) + inTyp := a.NewTypeExpr(0, n.In().Name(), nil, nil, nil) inTyp.Node().SetTypeChecked() - outTyp := a.NewTypeExpr(0, f.Out().Name(), nil, nil, nil) + outTyp := a.NewTypeExpr(0, n.Out().Name(), nil, nil, nil) outTyp.Node().SetTypeChecked() localVars := TypeMap{ t.IDIn: inTyp, @@ -232,8 +232,8 @@ func (c *Checker) checkFuncSignature(n *a.Node) error { if _, ok := c.structs[qid[0]]; !ok { return &Error{ Err: fmt.Errorf("check: no receiver struct defined for function %q", qid.String(c.idMap)), - Filename: f.Filename(), - Line: f.Line(), + Filename: n.Filename(), + Line: n.Line(), } } sTyp := a.NewTypeExpr(0, qid[0], nil, nil, nil) @@ -244,43 +244,43 @@ func (c *Checker) checkFuncSignature(n *a.Node) error { } c.funcs[qid] = Func{ QID: qid, - Func: f, + Func: n, LocalVars: localVars, } return nil } -func (c *Checker) checkFuncContract(n *a.Node) error { - as := n.Func().Asserts() - if len(as) == 0 { +func (c *Checker) checkFuncContract(node *a.Node) error { + n := node.Func() + if len(n.Asserts()) == 0 { return nil } q := &checker{ c: c, idMap: c.idMap, } - for _, a := range as { - if err := q.tcheckAssert(a.Assert()); err != nil { + for _, o := range n.Asserts() { + if err := q.tcheckAssert(o.Assert()); err != nil { return err } } return nil } -func (c *Checker) checkFuncBody(n *a.Node) error { - f := n.Func() +func (c *Checker) checkFuncBody(node *a.Node) error { + n := node.Func() q := &checker{ c: c, idMap: c.idMap, reasonMap: c.reasonMap, - f: c.funcs[f.QID()], + f: c.funcs[n.QID()], } // 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 - for _, m := range f.Body() { - if err := q.tcheckVars(m); err != nil { + for _, o := range n.Body() { + if err := q.tcheckVars(o); err != nil { return &Error{ Err: err, Filename: q.errFilename, @@ -292,8 +292,8 @@ func (c *Checker) checkFuncBody(n *a.Node) error { // TODO: check that variables are never used before they're initialized. // Assign ConstValue's (if applicable) and MType's to each Expr. - for _, m := range f.Body() { - if err := q.tcheckStatement(m); err != nil { + for _, o := range n.Body() { + if err := q.tcheckStatement(o); err != nil { return &Error{ Err: err, Filename: q.errFilename, @@ -303,8 +303,8 @@ func (c *Checker) checkFuncBody(n *a.Node) error { } // Run bounds checks. - for _, m := range f.Body() { - if err := q.bcheckStatement(m); err != nil { + for _, o := range n.Body() { + if err := q.bcheckStatement(o); err != nil { return &Error{ Err: err, Filename: q.errFilename, @@ -315,19 +315,19 @@ func (c *Checker) checkFuncBody(n *a.Node) error { } } - 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()) + n.Node().SetTypeChecked() + if err := n.Node().Walk(func(o *a.Node) error { + if !o.TypeChecked() { + return fmt.Errorf("check: internal error: unchecked %s node", o.Kind()) } - if n.Kind() == a.KExpr { - e := n.Expr() - if typ := e.MType(); typ == nil { + if o.Kind() == a.KExpr { + o := o.Expr() + if typ := o.MType(); typ == nil { return fmt.Errorf("check: internal error: expression %q has no (implicit) type", - e.String(q.idMap)) - } else if typ == TypeExprIdealNumber && e.ConstValue() == nil { + o.String(q.idMap)) + } else if typ == TypeExprIdealNumber && o.ConstValue() == nil { return fmt.Errorf("check: internal error: expression %q has ideal number type "+ - "but no const value", e.String(q.idMap)) + "but no const value", o.String(q.idMap)) } } return nil diff --git a/lang/check/type.go b/lang/check/type.go index 7930beca..13fd5c92 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -15,15 +15,15 @@ func (q *checker) tcheckVars(n *a.Node) error { q.errFilename, q.errLine = n.Raw().FilenameLine() if n.Kind() == a.KVar { - v := n.Var() - name := v.Name() + n := n.Var() + name := n.Name() if _, ok := q.f.LocalVars[name]; ok { return fmt.Errorf("check: duplicate var %q", q.idMap.ByID(name)) } - if err := q.tcheckTypeExpr(v.XType(), 0); err != nil { + if err := q.tcheckTypeExpr(n.XType(), 0); err != nil { return err } - q.f.LocalVars[name] = v.XType() + q.f.LocalVars[name] = n.XType() return nil } for _, l := range n.Raw().SubLists() { @@ -51,20 +51,20 @@ func (q *checker) tcheckStatement(n *a.Node) error { } case a.KVar: - o := n.Var() - if !o.XType().Node().TypeChecked() { - return fmt.Errorf("check: internal error: unchecked type expression %q", o.XType().String(q.idMap)) + n := n.Var() + if !n.XType().Node().TypeChecked() { + return fmt.Errorf("check: internal error: unchecked type expression %q", n.XType().String(q.idMap)) } - if value := o.Value(); value != nil { + if value := n.Value(); value != nil { if err := q.tcheckExpr(value, 0); err != nil { return err } - // TODO: check that value.Type is assignable to o.TypeExpr(). + // TODO: check that value.Type is assignable to n.TypeExpr(). } case a.KWhile: - o := n.While() - cond := o.Condition() + n := n.While() + cond := n.Condition() if err := q.tcheckExpr(cond, 0); err != nil { return err } @@ -72,21 +72,21 @@ func (q *checker) tcheckStatement(n *a.Node) error { return fmt.Errorf("check: for-loop condition %q, of type %q, does not have a boolean type", cond.String(q.idMap), cond.MType().String(q.idMap)) } - for _, m := range o.Asserts() { - if err := q.tcheckAssert(m.Assert()); err != nil { + for _, o := range n.Asserts() { + if err := q.tcheckAssert(o.Assert()); err != nil { return err } - m.SetTypeChecked() + o.SetTypeChecked() } - for _, m := range o.Body() { - if err := q.tcheckStatement(m); err != nil { + for _, o := range n.Body() { + if err := q.tcheckStatement(o); err != nil { return err } } case a.KIf: - for o := n.If(); o != nil; o = o.ElseIf() { - cond := o.Condition() + for n := n.If(); n != nil; n = n.ElseIf() { + cond := n.Condition() if err := q.tcheckExpr(cond, 0); err != nil { return err } @@ -94,21 +94,21 @@ func (q *checker) tcheckStatement(n *a.Node) error { return fmt.Errorf("check: if condition %q, of type %q, does not have a boolean type", cond.String(q.idMap), cond.MType().String(q.idMap)) } - for _, m := range o.BodyIfTrue() { - if err := q.tcheckStatement(m); err != nil { + for _, o := range n.BodyIfTrue() { + if err := q.tcheckStatement(o); err != nil { return err } } - for _, m := range o.BodyIfFalse() { - if err := q.tcheckStatement(m); err != nil { + for _, o := range n.BodyIfFalse() { + if err := q.tcheckStatement(o); err != nil { return err } } } case a.KReturn: - o := n.Return() - if value := o.Value(); value != nil { + n := n.Return() + if value := n.Value(); value != nil { if err := q.tcheckExpr(value, 0); err != nil { return err } @@ -136,11 +136,11 @@ func (q *checker) tcheckAssert(n *a.Assert) error { return fmt.Errorf("check: assert condition %q, of type %q, does not have a boolean type", cond.String(q.idMap), cond.MType().String(q.idMap)) } - for _, a := range n.Args() { - if err := q.tcheckExpr(a.Arg().Value(), 0); err != nil { + for _, o := range n.Args() { + if err := q.tcheckExpr(o.Arg().Value(), 0); err != nil { return err } - a.SetTypeChecked() + o.SetTypeChecked() } // TODO: check that there are no side effects. return nil @@ -511,15 +511,15 @@ func (q *checker) tcheckTypeExpr(n *a.TypeExpr, depth uint32) error { switch n.PackageOrDecorator().Key() { case 0: if name := n.Name(); name.IsNumType() || name.Key() == t.KeyBool { - for _, bound := range n.Bounds() { - if bound == nil { + for _, b := range n.Bounds() { + if b == nil { continue } - if err := q.tcheckExpr(bound, 0); err != nil { + if err := q.tcheckExpr(b, 0); err != nil { return err } - if bound.ConstValue() == nil { - return fmt.Errorf("check: %q is not constant", bound.String(q.idMap)) + if b.ConstValue() == nil { + return fmt.Errorf("check: %q is not constant", b.String(q.idMap)) } } break