mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 00:47:28 +01:00
Make the return value mandatory; add ok
This commit is contained in:
1 parent
24ace1c144
commit
762b320b5e
11 files changed
+45
-50
No files matched your search
+1
-1
@@ -596,7 +596,7 @@ func NewIf(condition *Expr, bodyIfTrue []*Node, bodyIfFalse []*Node, elseIf *If)
|
||||
|
||||
// Ret is "return LHS" or "yield LHS":
|
||||
// - ID0: <IDReturn|IDYield>
|
||||
// - LHS: <nil|Expr>
|
||||
// - LHS: <Expr>
|
||||
type Ret Node
|
||||
|
||||
func (n *Ret) AsNode() *Node { return (*Node)(n) }
|
||||
|
||||
@@ -298,10 +298,8 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
} else if lTyp == nil {
|
||||
return fmt.Errorf("TODO: allow returning nothing")
|
||||
}
|
||||
if v := n.Value(); v != nil {
|
||||
if err := q.bcheckAssignment1(nil, lTyp, t.IDEq, v); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := q.bcheckAssignment1(nil, lTyp, t.IDEq, n.Value()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KVar:
|
||||
|
||||
+13
-9
@@ -191,15 +191,14 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
} else if lTyp == nil {
|
||||
return fmt.Errorf("TODO: allow returning nothing")
|
||||
}
|
||||
if value := n.Value(); value != nil {
|
||||
if err := q.tcheckExpr(value, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
rTyp := value.MType()
|
||||
if !(rTyp.IsIdeal() && lTyp.IsNumType()) && !lTyp.EqIgnoringRefinements(rTyp) {
|
||||
return fmt.Errorf("check: cannot return %q (of type %q) as type %q",
|
||||
value.Str(q.tm), rTyp.Str(q.tm), lTyp.Str(q.tm))
|
||||
}
|
||||
value := n.Value()
|
||||
if err := q.tcheckExpr(value, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
rTyp := value.MType()
|
||||
if !(rTyp.IsIdeal() && lTyp.IsNumType()) && !lTyp.EqIgnoringRefinements(rTyp) {
|
||||
return fmt.Errorf("check: cannot return %q (of type %q) as type %q",
|
||||
value.Str(q.tm), rTyp.Str(q.tm), lTyp.Str(q.tm))
|
||||
}
|
||||
|
||||
case a.KVar:
|
||||
@@ -431,6 +430,11 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
|
||||
n.SetConstValue(zero)
|
||||
n.SetMType(typeExprNullptr)
|
||||
return nil
|
||||
|
||||
case t.IDOk:
|
||||
n.SetConstValue(zero)
|
||||
n.SetMType(typeExprStatus)
|
||||
return nil
|
||||
}
|
||||
|
||||
case t.IDOpenParen, t.IDTry:
|
||||
|
||||
+3
-6
@@ -603,12 +603,9 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
|
||||
case t.IDReturn, t.IDYield:
|
||||
p.src = p.src[1:]
|
||||
value, err := (*a.Expr)(nil), error(nil)
|
||||
if p.peek1() != t.IDSemicolon {
|
||||
value, err = p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
value, err := p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return a.NewRet(x, value).AsNode(), nil
|
||||
|
||||
|
||||
+13
-11
@@ -368,24 +368,25 @@ const (
|
||||
|
||||
const (
|
||||
minBuiltInLiteral = 0xB0
|
||||
minBuiltInNumLiteral = 0xB3
|
||||
minBuiltInNumLiteral = 0xB4
|
||||
maxBuiltInNumLiteral = 0xBF
|
||||
maxBuiltInLiteral = 0xBF
|
||||
|
||||
IDFalse = ID(0xB0)
|
||||
IDTrue = ID(0xB1)
|
||||
IDNullptr = ID(0xB2)
|
||||
IDOk = ID(0xB3)
|
||||
|
||||
ID0 = ID(0xB3)
|
||||
ID1 = ID(0xB4)
|
||||
ID2 = ID(0xB5)
|
||||
ID4 = ID(0xB6)
|
||||
ID8 = ID(0xB7)
|
||||
ID16 = ID(0xB8)
|
||||
ID32 = ID(0xB9)
|
||||
ID64 = ID(0xBA)
|
||||
ID128 = ID(0xBB)
|
||||
ID256 = ID(0xBC)
|
||||
ID0 = ID(0xB4)
|
||||
ID1 = ID(0xB5)
|
||||
ID2 = ID(0xB6)
|
||||
ID4 = ID(0xB7)
|
||||
ID8 = ID(0xB8)
|
||||
ID16 = ID(0xB9)
|
||||
ID32 = ID(0xBA)
|
||||
ID64 = ID(0xBB)
|
||||
ID128 = ID(0xBC)
|
||||
ID256 = ID(0xBD)
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -653,6 +654,7 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDFalse: "false",
|
||||
IDTrue: "true",
|
||||
IDNullptr: "nullptr",
|
||||
IDOk: "ok",
|
||||
|
||||
ID0: "0",
|
||||
ID1: "1",
|
||||
|
||||
Reference in new issue
Block a user