Make error "foo" an expression.

This commit is contained in:
Nigel Tao committed 2017-10-27 13:00:13 +11:00
1 parent 9a8508857f
commit 7cefcccc98
7 files changed
+73 -16

No files matched your search

+16
View File
@@ -16,6 +16,9 @@ package cgen
import (
"fmt"
"strings"
"github.com/google/puffs/lang/builtin"
a "github.com/google/puffs/lang/ast"
t "github.com/google/puffs/lang/token"
@@ -404,6 +407,19 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.writes("private_impl." + fPrefix)
b.writes(n.ID1().String(g.tm))
return nil
case t.KeyError, t.KeyStatus, t.KeySuspension:
status := g.statusMap[n.ID1()]
if status.name == "" {
msg := builtin.TrimQuotes(n.ID1().String(g.tm))
z := builtin.StatusMap[msg]
if z.Message == "" {
return fmt.Errorf("no status code for %q", msg)
}
status.name = strings.ToUpper(g.cName(z.String()))
}
b.writes(status.name)
return nil
}
return fmt.Errorf("unrecognized token.Key (0x%X) for writeExprOther", n.ID0().Key())
}
+1 -1
View File
@@ -1256,7 +1256,7 @@ puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
: 0,
})
.len));
if ((v_block_size == 0) && (v_z > 0)) {
if ((v_block_size == 0) && (v_z == PUFFS_GIF__SUSPENSION_SHORT_READ)) {
goto label_1_break;
}
status = v_z;
+3
View File
@@ -239,6 +239,9 @@ const MaxExprDepth = 255
// For selectors, like "LHS.ID1", ID0 is IDDot.
//
// For lists, like "$(0, 1, 2)", ID0 is IDDollar.
//
// For statuses, like `error "foo"` and `"suspension "bar"`, ID0 is the keyword
// and ID1 is the message.
type Expr Node
func (n *Expr) Node() *Node { return (*Node)(n) }
+3
View File
@@ -885,6 +885,9 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
return nil, nil, err
}
case t.KeyError, t.KeyStatus, t.KeySuspension:
// No-op.
default:
return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprOther", n.ID0().Key())
}
+21
View File
@@ -159,6 +159,7 @@ func (q *checker) tcheckStatement(n *a.Node) error {
case a.KReturn:
n := n.Return()
if nk := n.Keyword(); nk != 0 {
// TODO: delete.
sk := t.ID(0)
if s, ok := q.c.statuses[n.Message()]; ok {
sk = s.Status.Keyword()
@@ -641,6 +642,26 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
case t.KeyDot:
return q.tcheckDot(n, depth)
case t.KeyError, t.KeyStatus, t.KeySuspension:
nominalKeyword := n.ID0()
declaredKeyword := t.ID(0)
if s, ok := q.c.statuses[n.ID1()]; ok {
declaredKeyword = s.Status.Keyword()
} else {
msg := builtin.TrimQuotes(n.ID1().String(q.tm))
z, ok := builtin.StatusMap[msg]
if !ok {
return fmt.Errorf("check: no error or status with message %q", msg)
}
declaredKeyword = z.Keyword
}
if nominalKeyword != declaredKeyword {
return fmt.Errorf("check: status literal says %q but declaration says %q",
nominalKeyword.String(q.tm), declaredKeyword.String(q.tm))
}
n.SetMType(typeExprStatus)
return nil
case t.KeyDollar:
for _, o := range n.Args() {
o := o.Expr()
+28 -13
View File
@@ -619,6 +619,7 @@ func (p *parser) parseStatement1() (*a.Node, error) {
case t.KeySemicolon:
// No-op.
case t.KeyError, t.KeySuspension:
// TODO: delete.
keyword = x
p.src = p.src[1:]
message = p.peek1()
@@ -877,19 +878,6 @@ func (p *parser) parseExpr() (*a.Expr, error) {
func (p *parser) parseOperand() (*a.Expr, error) {
switch x := p.peek1(); {
case x.Key() == t.KeyOpenParen:
p.src = p.src[1:]
expr, err := p.parseExpr()
if err != nil {
return nil, err
}
if x := p.peek1().Key(); x != t.KeyCloseParen {
got := p.tm.ByKey(x)
return nil, fmt.Errorf(`parse: expected ")", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
return expr, nil
case x.IsUnaryOp():
p.src = p.src[1:]
rhs, err := p.parseOperand()
@@ -905,6 +893,33 @@ func (p *parser) parseOperand() (*a.Expr, error) {
case x.IsLiteral():
p.src = p.src[1:]
return a.NewExpr(0, 0, x, nil, nil, nil, nil), nil
default:
switch x.Key() {
case t.KeyOpenParen:
p.src = p.src[1:]
expr, err := p.parseExpr()
if err != nil {
return nil, err
}
if x := p.peek1().Key(); x != t.KeyCloseParen {
got := p.tm.ByKey(x)
return nil, fmt.Errorf(`parse: expected ")", got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
return expr, nil
case t.KeyError, t.KeyStatus, t.KeySuspension:
keyword := x
p.src = p.src[1:]
message := p.peek1()
if !message.IsStrLiteral() {
got := p.tm.ByID(message)
return nil, fmt.Errorf(`parse: expected string literal, got %q at %s:%d`, got, p.filename, p.line())
}
p.src = p.src[1:]
return a.NewExpr(0, keyword, message, nil, nil, nil, nil), nil
}
}
id, err := p.parseIdent()
+1 -2
View File
@@ -176,8 +176,7 @@ pri func decoder.decode_id?(dst writer1, src reader1)() {
return error "internal error: inconsistent limited read"
}
block_size -= r.since_mark().length()
// TODO: z.is_suspension() should be (z == suspension "short read").
if (block_size == 0) and z.is_suspension() {
if (block_size == 0) and (z == suspension "short read") {
break
}
return z