mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
base: add {io_reader,io_writer}.peek_undo_byte
This commit is contained in:
1 parent
29e49cded4
commit
d9bb6d4b4f
4 files changed
+58
-35
No files matched your search
+40
-24
@@ -127,7 +127,7 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, sideEffectsOnly bool, depth
|
||||
return nil
|
||||
}
|
||||
case t.IDTokenWriter:
|
||||
return g.writeBuiltinTokenWriter(b, recv, method.Ident(), n.Args(), depth)
|
||||
return g.writeBuiltinTokenWriter(b, recv, method.Ident(), n.Args(), sideEffectsOnly, depth)
|
||||
case t.IDUtility:
|
||||
switch method.Ident() {
|
||||
case t.IDCPUArchIs32Bit:
|
||||
@@ -159,7 +159,7 @@ func (g *gen) recvName(recv *a.Expr) (string, error) {
|
||||
return "", fmt.Errorf("recvName: cannot cgen a %q expression", recv.Str(g.tm))
|
||||
}
|
||||
|
||||
func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error {
|
||||
func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error {
|
||||
switch method {
|
||||
case t.IDLength:
|
||||
recvName, err := g.recvName(recv)
|
||||
@@ -168,6 +168,40 @@ func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Nod
|
||||
}
|
||||
b.printf("((uint64_t)(%s%s - %s%s))", io2Prefix, recvName, iopPrefix, recvName)
|
||||
return nil
|
||||
|
||||
case t.IDPeekUndoByte:
|
||||
recvName, err := g.recvName(recv)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf("%s%s[-1]", iopPrefix, recvName)
|
||||
return nil
|
||||
|
||||
case t.IDUndoByte:
|
||||
recvName, err := g.recvName(recv)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !sideEffectsOnly {
|
||||
// Generate a two part expression using the comma operator: "(etc,
|
||||
// return_empty_struct call)". The final part is a function call
|
||||
// (to a static inline function) instead of a struct literal, to
|
||||
// avoid a "expression result unused" compiler error.
|
||||
b.writes("(")
|
||||
}
|
||||
b.printf("%s%s--", iopPrefix, recvName)
|
||||
if !sideEffectsOnly {
|
||||
b.writes(", wuffs_base__make_empty_struct())")
|
||||
}
|
||||
return nil
|
||||
|
||||
case t.IDCanUndoByte:
|
||||
recvName, err := g.recvName(recv)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf("(%s%s > %s%s)", iopPrefix, recvName, io1Prefix, recvName)
|
||||
return nil
|
||||
}
|
||||
return errNoSuchBuiltin
|
||||
}
|
||||
@@ -189,24 +223,6 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
b.writes("))))))")
|
||||
return nil
|
||||
|
||||
case t.IDUndoByte:
|
||||
if !sideEffectsOnly {
|
||||
// Generate a two part expression using the comma operator: "(etc,
|
||||
// return_empty_struct call)". The final part is a function call
|
||||
// (to a static inline function) instead of a struct literal, to
|
||||
// avoid a "expression result unused" compiler error.
|
||||
b.writes("(")
|
||||
}
|
||||
b.printf("%s%s--", iopPrefix, recvName)
|
||||
if !sideEffectsOnly {
|
||||
b.writes(", wuffs_base__make_empty_struct())")
|
||||
}
|
||||
return nil
|
||||
|
||||
case t.IDCanUndoByte:
|
||||
b.printf("(%s%s > %s%s)", iopPrefix, recvName, io1Prefix, recvName)
|
||||
return nil
|
||||
|
||||
case t.IDLimitedCopyU32ToSlice:
|
||||
b.printf("wuffs_private_impl__io_reader__limited_copy_u32_to_slice(\n&%s%s, %s%s,",
|
||||
iopPrefix, recvName, io2Prefix, recvName)
|
||||
@@ -293,7 +309,7 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
}
|
||||
}
|
||||
|
||||
return g.writeBuiltinIO(b, recv, method, args, depth)
|
||||
return g.writeBuiltinIO(b, recv, method, args, sideEffectsOnly, depth)
|
||||
}
|
||||
|
||||
func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error {
|
||||
@@ -397,10 +413,10 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
}
|
||||
}
|
||||
|
||||
return g.writeBuiltinIO(b, recv, method, args, depth)
|
||||
return g.writeBuiltinIO(b, recv, method, args, sideEffectsOnly, depth)
|
||||
}
|
||||
|
||||
func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error {
|
||||
func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error {
|
||||
switch method {
|
||||
case t.IDWriteSimpleTokenFast, t.IDWriteExtendedTokenFast:
|
||||
recvName, err := g.recvName(recv)
|
||||
@@ -444,7 +460,7 @@ func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args
|
||||
return nil
|
||||
}
|
||||
|
||||
return g.writeBuiltinIO(b, recv, method, args, depth)
|
||||
return g.writeBuiltinIO(b, recv, method, args, sideEffectsOnly, depth)
|
||||
}
|
||||
|
||||
func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, returnType *a.TypeExpr, args []*a.Node, sideEffectsOnly bool, depth uint32) error {
|
||||
|
||||
@@ -433,6 +433,7 @@ var funcsOther = [...]string{
|
||||
// ---- io_reader
|
||||
|
||||
"io_reader.can_undo_byte() bool",
|
||||
"io_reader.peek_undo_byte() u8",
|
||||
"io_reader.undo_byte!()",
|
||||
|
||||
"io_reader.read_u8?() u8",
|
||||
@@ -528,6 +529,10 @@ var funcsOther = [...]string{
|
||||
|
||||
// ---- io_writer
|
||||
|
||||
"io_writer.can_undo_byte() bool",
|
||||
"io_writer.peek_undo_byte() u8",
|
||||
"io_writer.undo_byte!()",
|
||||
|
||||
"io_writer.write_u8?(a: u8)",
|
||||
"io_writer.write_u16be?(a: u16)",
|
||||
"io_writer.write_u16le?(a: u16)",
|
||||
|
||||
@@ -1196,8 +1196,8 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
|
||||
}
|
||||
|
||||
} else if recvTyp.IsIOTokenType() {
|
||||
if method == t.IDUndoByte {
|
||||
if err := q.canUndoByte(recv); err != nil {
|
||||
if (method == t.IDUndoByte) || (method == t.IDPeekUndoByte) {
|
||||
if err := q.canUndoByte(recv, method == t.IDPeekUndoByte); err != nil {
|
||||
return bounds{}, err
|
||||
}
|
||||
|
||||
@@ -1319,11 +1319,13 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
|
||||
return bounds{}, errNotASpecialCase
|
||||
}
|
||||
|
||||
func (q *checker) canUndoByte(recv *a.Expr) error {
|
||||
func (q *checker) canUndoByte(recv *a.Expr, justPeeking bool) error {
|
||||
for _, x := range q.facts {
|
||||
if lhs, meth, args, _ := x.IsMethodCall(); (meth != t.IDCanUndoByte) || (len(args) != 0) ||
|
||||
!lhs.Eq(recv) {
|
||||
continue
|
||||
} else if justPeeking {
|
||||
return nil
|
||||
}
|
||||
return q.facts.update(func(o *a.Expr) (*a.Expr, error) {
|
||||
if o.Mentions(recv) {
|
||||
|
||||
+8
-8
@@ -566,9 +566,8 @@ const (
|
||||
|
||||
// --------
|
||||
|
||||
IDPeekU64LEAt = ID(0x1A0)
|
||||
|
||||
IDPeekU8 = ID(0x1A1)
|
||||
IDPeekUndoByte = ID(0x1A0)
|
||||
IDPeekU8 = ID(0x1A1)
|
||||
|
||||
IDPeekU8AsU16 = ID(0x1A5)
|
||||
IDPeekU16BE = ID(0x1A6)
|
||||
@@ -598,9 +597,9 @@ const (
|
||||
IDPeekU64BE = ID(0x1BE)
|
||||
IDPeekU64LE = ID(0x1BF)
|
||||
|
||||
// --------
|
||||
IDPeekU64LEAt = ID(0x1C0)
|
||||
|
||||
// TODO: IDUnwriteU8?
|
||||
// --------
|
||||
|
||||
IDWriteU8 = ID(0x1C1)
|
||||
IDWriteU16BE = ID(0x1C2)
|
||||
@@ -1015,9 +1014,8 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
|
||||
// --------
|
||||
|
||||
IDPeekU64LEAt: "peek_u64le_at",
|
||||
|
||||
IDPeekU8: "peek_u8",
|
||||
IDPeekUndoByte: "peek_undo_byte",
|
||||
IDPeekU8: "peek_u8",
|
||||
|
||||
IDPeekU8AsU16: "peek_u8_as_u16",
|
||||
IDPeekU16BE: "peek_u16be",
|
||||
@@ -1047,6 +1045,8 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDPeekU64BE: "peek_u64be",
|
||||
IDPeekU64LE: "peek_u64le",
|
||||
|
||||
IDPeekU64LEAt: "peek_u64le_at",
|
||||
|
||||
// --------
|
||||
|
||||
IDWriteU8: "write_u8",
|
||||
|
||||
Reference in new issue
Block a user