Un-special-case parsing base."etc"

This commit is contained in:
Nigel Tao committed 2020-06-10 11:34:56 +10:00
1 parent 4e2d0c1e5f
commit 74d291453d
5 files changed
+40 -31

No files matched your search

+1 -1
View File
@@ -317,7 +317,7 @@ func (q *checker) bcheckStatement(n *a.Node) error {
}
if lTyp.IsStatus() {
if v := n.Value(); v.Operator() == 0 {
if v := n.Value(); (v.Operator() == 0) || (v.Operator() == t.IDDot) {
if id := v.Ident(); (id != t.IDOk) && (q.hasIsErrorFact(id) || isErrorStatus(id, q.tm)) {
n.SetRetsError()
}
+6 -3
View File
@@ -502,9 +502,12 @@ func (q *checker) tcheckExprXDotY(n *a.Expr, x t.ID, y t.ID) error {
n.SetMType(c.XType())
return nil
}
// TODO: look for other (global) names: consts, funcs, statuses,
// structs from used packages.
return fmt.Errorf("check: unrecognized identifier %q", qid.Str(q.tm))
if _, ok := q.c.statuses[t.QID{x, y}]; ok {
n.SetMType(typeExprStatus)
return nil
}
// TODO: look in q.c.structs.
return fmt.Errorf("check: unrecognized name %q", qid.Str(q.tm))
}
func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error {
+7 -15
View File
@@ -1355,22 +1355,14 @@ func (p *parser) parseOperand() (*a.Expr, error) {
case t.IDDot:
p.src = p.src[1:]
if x := p.peek1(); x.IsLiteral(p.tm) {
if !x.IsDQStrLiteral(p.tm) {
return nil, fmt.Errorf(`parse: dot followed by non-"-string literal at %s:%d`, p.filename, p.line())
}
if !first {
return nil, fmt.Errorf(`parse: "-string literal %s has too many package qualifiers at %s:%d`,
x.Str(p.tm), p.filename, p.line())
}
selector := p.peek1()
if first && selector.IsDQStrLiteral(p.tm) {
p.src = p.src[1:]
return a.NewExpr(0, 0, id, x, nil, nil, nil, nil), nil
}
selector, err := p.parseIdent()
if err != nil {
return nil, err
} else {
selector, err = p.parseIdent()
if err != nil {
return nil, err
}
}
lhs = a.NewExpr(0, t.IDDot, 0, selector, lhs.AsNode(), nil, nil, nil)
}