mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 08:47:28 +01:00
Rename unread_u8? to undo_byte!; add can_undo_byte
This commit is contained in:
1 parent
ce3d99a6d5
commit
9e300fc4f8
14 files changed
+148
-154
No files matched your search
@@ -51,7 +51,8 @@ var StatusList = [...]Status{
|
||||
|
||||
{t.IDError, -0x20, "cannot return a suspension"},
|
||||
|
||||
{t.IDError, -0x30, "invalid I/O operation"},
|
||||
{t.IDError, -0x30, "invalid I/O operation"}, // TODO: no longer used; delete.
|
||||
|
||||
{t.IDError, -0x31, "unexpected EOF"}, // Used if reading when closed == true.
|
||||
{t.IDError, -0x32, "closed for writes"}, // TODO: is this unused? Should callee or caller check closed-ness?
|
||||
|
||||
@@ -140,7 +141,9 @@ var Funcs = []string{
|
||||
|
||||
// ---- io_reader
|
||||
|
||||
"io_reader.unread_u8?()()",
|
||||
"io_reader.can_undo_byte()(ret bool)",
|
||||
"io_reader.undo_byte!()()",
|
||||
|
||||
"io_reader.read_u8?()(ret u8)",
|
||||
"io_reader.read_u16be?()(ret u16)",
|
||||
"io_reader.read_u16le?()(ret u16)",
|
||||
|
||||
+30
-23
@@ -214,10 +214,6 @@ loop:
|
||||
func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
q.errFilename, q.errLine = n.AsRaw().FilenameLine()
|
||||
|
||||
// TODO: be principled about checking for provenNotToSuspend. Should we
|
||||
// call optimizeSuspendible only for assignments, for var statements too,
|
||||
// or for all statements generally?
|
||||
|
||||
switch n.Kind() {
|
||||
case a.KAssert:
|
||||
if err := q.bcheckAssert(n.AsAssert()); err != nil {
|
||||
@@ -235,11 +231,6 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
if _, err := q.bcheckExpr(n, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
if n.Suspendible() {
|
||||
if err := q.optimizeSuspendible(n, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
case a.KIOBind:
|
||||
n := n.AsIOBind()
|
||||
@@ -427,19 +418,6 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: be principled about checking for provenNotToSuspend, and for
|
||||
// updating facts like "in.src.available() >= 6" after "in.src.read_u8?()".
|
||||
// In general, we need to invalidate any "foo.bar()" facts after a call to
|
||||
// an impure function like "foo.meth0!()" or "foo.meth1?()".
|
||||
//
|
||||
// What's here is somewhat ad hoc. Perhaps we need a call keyword and an
|
||||
// explicit "foo = call bar?()" syntax.
|
||||
if rhs.Suspendible() {
|
||||
if err := q.optimizeSuspendible(rhs, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -985,7 +963,12 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (a.Bounds,
|
||||
} else if recvTyp.IsIOType() {
|
||||
advance, update := (*big.Int)(nil), false
|
||||
|
||||
if method == t.IDSkipFast {
|
||||
if method == t.IDUndoByte {
|
||||
if err := q.canUndoByte(recv); err != nil {
|
||||
return a.Bounds{}, err
|
||||
}
|
||||
|
||||
} else if method == t.IDSkipFast {
|
||||
args := n.Args()
|
||||
if len(args) != 2 {
|
||||
return a.Bounds{}, fmt.Errorf("check: internal error: bad skip_fast arguments")
|
||||
@@ -1017,12 +1000,36 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (a.Bounds,
|
||||
return a.Bounds{}, fmt.Errorf("check: could not prove %s precondition: %s.available() >= %v",
|
||||
method.Str(q.tm), recv.Str(q.tm), advance)
|
||||
}
|
||||
// TODO: drop other recv-related facts?
|
||||
}
|
||||
}
|
||||
|
||||
return a.Bounds{}, errNotASpecialCase
|
||||
}
|
||||
|
||||
func (q *checker) canUndoByte(recv *a.Expr) error {
|
||||
for _, x := range q.facts {
|
||||
if x.Operator() != t.IDOpenParen || len(x.Args()) != 0 {
|
||||
continue
|
||||
}
|
||||
x = x.LHS().AsExpr()
|
||||
if x.Operator() != t.IDDot || x.Ident() != t.IDCanUndoByte {
|
||||
continue
|
||||
}
|
||||
x = x.LHS().AsExpr()
|
||||
if !x.Eq(recv) {
|
||||
continue
|
||||
}
|
||||
return q.facts.update(func(o *a.Expr) (*a.Expr, error) {
|
||||
if o.Mentions(recv) {
|
||||
return nil, nil
|
||||
}
|
||||
return o, nil
|
||||
})
|
||||
}
|
||||
return fmt.Errorf("check: could not prove %s.can_undo_byte()", recv.Str(q.tm))
|
||||
}
|
||||
|
||||
var ioMethodAdvances = [...]struct {
|
||||
advance *big.Int
|
||||
update bool
|
||||
|
||||
@@ -24,7 +24,6 @@ package check
|
||||
// code but never actually suspend.
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math/big"
|
||||
|
||||
a "github.com/google/wuffs/lang/ast"
|
||||
@@ -175,46 +174,6 @@ check2:
|
||||
return nil
|
||||
}
|
||||
|
||||
func (q *checker) optimizeSuspendible(n *a.Expr, depth uint32) error {
|
||||
if depth > a.MaxExprDepth {
|
||||
return fmt.Errorf("check: expression recursion depth too large")
|
||||
}
|
||||
depth++
|
||||
|
||||
if !n.CallSuspendible() {
|
||||
for _, o := range n.AsNode().AsRaw().SubNodes() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := q.optimizeSuspendible(o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := q.optimizeSuspendible(o.AsExpr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
nReceiver, nMethod, _ := splitReceiverMethodArgs(n)
|
||||
if nReceiver == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: check that nReceiver's type is actually a io_reader or io_writer.
|
||||
|
||||
if nMethod == t.IDUnreadU8 {
|
||||
// unread_u8 can never suspend, only succeed or fail.
|
||||
n.SetProvenNotToSuspend()
|
||||
return nil
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, update bool) (retOK bool, retErr error) {
|
||||
// TODO: do two passes? The first one to non-destructively check retOK. The
|
||||
// second one to drop facts if indeed retOK? Otherwise, an advance
|
||||
|
||||
+14
-12
@@ -444,7 +444,7 @@ const (
|
||||
|
||||
// TODO Read/Write 24 bits? It might be useful for RGB triples.
|
||||
|
||||
IDUnreadU8 = ID(0x140)
|
||||
IDUndoByte = ID(0x140)
|
||||
IDReadU8 = ID(0x141)
|
||||
IDReadU16BE = ID(0x142)
|
||||
IDReadU16LE = ID(0x143)
|
||||
@@ -510,11 +510,12 @@ const (
|
||||
IDWriteFastU64BE = ID(0x17E)
|
||||
IDWriteFastU64LE = ID(0x17F)
|
||||
|
||||
IDSetLimit = ID(0x180)
|
||||
IDSetMark = ID(0x181)
|
||||
IDSinceMark = ID(0x182)
|
||||
IDSkip = ID(0x183)
|
||||
IDSkipFast = ID(0x184)
|
||||
IDCanUndoByte = ID(0x180)
|
||||
IDSetLimit = ID(0x181)
|
||||
IDSetMark = ID(0x182)
|
||||
IDSinceMark = ID(0x183)
|
||||
IDSkip = ID(0x184)
|
||||
IDSkipFast = ID(0x185)
|
||||
|
||||
IDCopyFromSlice = ID(0x190)
|
||||
IDCopyNFromHistory = ID(0x191)
|
||||
@@ -721,7 +722,7 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDOut: "out",
|
||||
IDBase: "base",
|
||||
|
||||
IDUnreadU8: "unread_u8",
|
||||
IDUndoByte: "undo_byte",
|
||||
IDReadU8: "read_u8",
|
||||
IDReadU16BE: "read_u16be",
|
||||
IDReadU16LE: "read_u16le",
|
||||
@@ -786,11 +787,12 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDWriteFastU64BE: "write_fast_u64be",
|
||||
IDWriteFastU64LE: "write_fast_u64le",
|
||||
|
||||
IDSetLimit: "set_limit",
|
||||
IDSetMark: "set_mark",
|
||||
IDSinceMark: "since_mark",
|
||||
IDSkip: "skip",
|
||||
IDSkipFast: "skip_fast",
|
||||
IDCanUndoByte: "can_undo_byte",
|
||||
IDSetLimit: "set_limit",
|
||||
IDSetMark: "set_mark",
|
||||
IDSinceMark: "since_mark",
|
||||
IDSkip: "skip",
|
||||
IDSkipFast: "skip_fast",
|
||||
|
||||
IDCopyFromSlice: "copy_from_slice",
|
||||
IDCopyNFromHistory: "copy_n_from_history",
|
||||
|
||||
Reference in new issue
Block a user