mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 00:47:28 +01:00
Rename buf1, reader1, etc to io_buffer, io_reader
Also remove the unused Buf1, Buf2 and Usize tokens.
This commit is contained in:
1 parent
82a48796c8
commit
97aab37462
46 files changed
+823
-847
No files matched your search
+4
-4
@@ -277,9 +277,9 @@ func (n *Raw) SetPackage(tm *t.Map, pkg t.ID) error {
|
||||
// TODO: Add signed integer types, as per the builtin.Types var?
|
||||
//
|
||||
// Or, don't hard code these, and instead require built-in types to
|
||||
// have qualified names, such as "builtin.u8" or "base.reader1"?
|
||||
// have qualified names, such as "builtin.u8" or "base.io_reader"?
|
||||
switch o.id2.Key() {
|
||||
case t.KeyU8, t.KeyU16, t.KeyU32, t.KeyU64, t.KeyBool, t.KeyStatus, t.KeyReader1, t.KeyWriter1:
|
||||
case t.KeyU8, t.KeyU16, t.KeyU32, t.KeyU64, t.KeyBool, t.KeyStatus, t.KeyIOReader, t.KeyIOWriter:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -700,7 +700,7 @@ func (n *TypeExpr) IsSliceType() bool {
|
||||
|
||||
func (n *TypeExpr) IsUnsignedInteger() bool {
|
||||
return n.id0 == 0 && (n.id2.Key() == t.KeyU8 || n.id2.Key() == t.KeyU16 ||
|
||||
n.id2.Key() == t.KeyU32 || n.id2.Key() == t.KeyU64) // TODO: t.KeyUsize?
|
||||
n.id2.Key() == t.KeyU32 || n.id2.Key() == t.KeyU64)
|
||||
}
|
||||
|
||||
func (n *TypeExpr) HasPointers() bool {
|
||||
@@ -708,7 +708,7 @@ func (n *TypeExpr) HasPointers() bool {
|
||||
switch n.id0.Key() {
|
||||
case 0:
|
||||
switch n.id2.Key() {
|
||||
case t.KeyBuf1, t.KeyReader1, t.KeyWriter1, t.KeyBuf2:
|
||||
case t.KeyIOReader, t.KeyIOWriter:
|
||||
return true
|
||||
}
|
||||
case t.KeyPtr, t.KeyNptr, t.KeyColon:
|
||||
|
||||
+33
-33
@@ -71,8 +71,8 @@ var Types = []string{
|
||||
"u64",
|
||||
"bool",
|
||||
"status",
|
||||
"reader1",
|
||||
"writer1",
|
||||
"io_reader",
|
||||
"io_writer",
|
||||
"image_config",
|
||||
}
|
||||
|
||||
@@ -92,40 +92,40 @@ var Funcs = []string{
|
||||
"status.is_ok()(ret bool)",
|
||||
"status.is_suspension()(ret bool)",
|
||||
|
||||
"reader1.read_u8?()(ret u8)",
|
||||
"reader1.read_u16be?()(ret u16)",
|
||||
"reader1.read_u16le?()(ret u16)",
|
||||
"reader1.read_u32be?()(ret u32)",
|
||||
"reader1.read_u32le?()(ret u32)",
|
||||
"reader1.read_u64be?()(ret u64)",
|
||||
"reader1.read_u64le?()(ret u64)",
|
||||
"io_reader.read_u8?()(ret u8)",
|
||||
"io_reader.read_u16be?()(ret u16)",
|
||||
"io_reader.read_u16le?()(ret u16)",
|
||||
"io_reader.read_u32be?()(ret u32)",
|
||||
"io_reader.read_u32le?()(ret u32)",
|
||||
"io_reader.read_u64be?()(ret u64)",
|
||||
"io_reader.read_u64le?()(ret u64)",
|
||||
|
||||
"reader1.available()(ret u64)",
|
||||
"reader1.is_marked()(ret bool)",
|
||||
"reader1.limit(l u64)(ret reader1)",
|
||||
"reader1.mark()()",
|
||||
"reader1.since_mark()(ret[] u8)",
|
||||
"reader1.skip32?(n u32)()",
|
||||
"reader1.skip64?(n u64)()",
|
||||
"reader1.unread_u8?()()",
|
||||
"io_reader.available()(ret u64)",
|
||||
"io_reader.is_marked()(ret bool)",
|
||||
"io_reader.limit(l u64)(ret io_reader)",
|
||||
"io_reader.mark()()",
|
||||
"io_reader.since_mark()(ret[] u8)",
|
||||
"io_reader.skip32?(n u32)()",
|
||||
"io_reader.skip64?(n u64)()",
|
||||
"io_reader.unread_u8?()()",
|
||||
|
||||
"writer1.write_u8?(x u8)()",
|
||||
"writer1.write_u16be?(x u16)()",
|
||||
"writer1.write_u16le?(x u16)()",
|
||||
"writer1.write_u32be?(x u32)()",
|
||||
"writer1.write_u32le?(x u32)()",
|
||||
"writer1.write_u64be?(x u64)()",
|
||||
"writer1.write_u64le?(x u64)()",
|
||||
"io_writer.write_u8?(x u8)()",
|
||||
"io_writer.write_u16be?(x u16)()",
|
||||
"io_writer.write_u16le?(x u16)()",
|
||||
"io_writer.write_u32be?(x u32)()",
|
||||
"io_writer.write_u32le?(x u32)()",
|
||||
"io_writer.write_u64be?(x u64)()",
|
||||
"io_writer.write_u64le?(x u64)()",
|
||||
|
||||
"writer1.available()(ret u64)",
|
||||
"writer1.copy_from_history32(distance u32, length u32)(ret u32)",
|
||||
"writer1.copy_from_reader32(r reader1, length u32)(ret u32)",
|
||||
"writer1.copy_from_slice(s[] u8)(ret u64)",
|
||||
"writer1.copy_from_slice32(s[] u8, length u32)(ret u32)",
|
||||
"writer1.is_marked()(ret bool)",
|
||||
"writer1.limit(l u64)(ret writer1)",
|
||||
"writer1.mark()()",
|
||||
"writer1.since_mark()(ret[] u8)",
|
||||
"io_writer.available()(ret u64)",
|
||||
"io_writer.copy_from_history32(distance u32, length u32)(ret u32)",
|
||||
"io_writer.copy_from_reader32(r io_reader, length u32)(ret u32)",
|
||||
"io_writer.copy_from_slice(s[] u8)(ret u64)",
|
||||
"io_writer.copy_from_slice32(s[] u8, length u32)(ret u32)",
|
||||
"io_writer.is_marked()(ret bool)",
|
||||
"io_writer.limit(l u64)(ret io_writer)",
|
||||
"io_writer.mark()()",
|
||||
"io_writer.since_mark()(ret[] u8)",
|
||||
|
||||
"image_config.initialize!(pixfmt u32, pixsub u32, width u32, height u32, num_loops u32)()",
|
||||
}
|
||||
|
||||
+12
-13
@@ -23,16 +23,15 @@ import (
|
||||
)
|
||||
|
||||
var numTypeBounds = [256][2]*big.Int{
|
||||
t.KeyI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)},
|
||||
t.KeyI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)},
|
||||
t.KeyI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)},
|
||||
t.KeyI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)},
|
||||
t.KeyU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)},
|
||||
t.KeyU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)},
|
||||
t.KeyU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)},
|
||||
t.KeyU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)},
|
||||
t.KeyUsize: {zero, zero},
|
||||
t.KeyBool: {zero, one},
|
||||
t.KeyI8: {big.NewInt(-1 << 7), big.NewInt(1<<7 - 1)},
|
||||
t.KeyI16: {big.NewInt(-1 << 15), big.NewInt(1<<15 - 1)},
|
||||
t.KeyI32: {big.NewInt(-1 << 31), big.NewInt(1<<31 - 1)},
|
||||
t.KeyI64: {big.NewInt(-1 << 63), big.NewInt(1<<63 - 1)},
|
||||
t.KeyU8: {zero, big.NewInt(0).SetUint64(1<<8 - 1)},
|
||||
t.KeyU16: {zero, big.NewInt(0).SetUint64(1<<16 - 1)},
|
||||
t.KeyU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)},
|
||||
t.KeyU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)},
|
||||
t.KeyBool: {zero, one},
|
||||
}
|
||||
|
||||
var (
|
||||
@@ -1192,11 +1191,11 @@ func (q *checker) bcheckTypeExpr(typ *a.TypeExpr) (*big.Int, *big.Int, error) {
|
||||
return nil, nil, nil
|
||||
}
|
||||
|
||||
// TODO: is the special cases for reader1 and writer1 superfluous with the
|
||||
// general purpose code for built-ins below?
|
||||
// TODO: is the special cases for io_reader and io_writer superfluous with
|
||||
// the general purpose code for built-ins below?
|
||||
if qid := typ.QID(); qid[0] == 0 {
|
||||
switch qid[1].Key() {
|
||||
case t.KeyReader1, t.KeyWriter1:
|
||||
case t.KeyIOReader, t.KeyIOWriter:
|
||||
return nil, nil, nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ func (q *checker) optimizeNonSuspendible(n *a.Expr) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: check that nReceiver's type is actually a reader1 or writer1.
|
||||
// TODO: check that nReceiver's type is actually a io_reader or io_writer.
|
||||
|
||||
switch nMethod {
|
||||
case t.KeyCopyFromHistory32:
|
||||
@@ -225,7 +225,7 @@ func (q *checker) optimizeSuspendible(n *a.Expr, depth uint32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// TODO: check that nReceiver's type is actually a reader1 or writer1.
|
||||
// TODO: check that nReceiver's type is actually a io_reader or io_writer.
|
||||
|
||||
if nMethod == t.KeyUnreadU8 {
|
||||
// unread_u8 can never suspend, only succeed or fail.
|
||||
|
||||
@@ -44,8 +44,8 @@ var (
|
||||
typeExprU64 = a.NewTypeExpr(0, 0, t.IDU64, nil, nil, nil)
|
||||
typeExprBool = a.NewTypeExpr(0, 0, t.IDBool, nil, nil, nil)
|
||||
typeExprStatus = a.NewTypeExpr(0, 0, t.IDStatus, nil, nil, nil)
|
||||
typeExprReader1 = a.NewTypeExpr(0, 0, t.IDReader1, nil, nil, nil)
|
||||
typeExprWriter1 = a.NewTypeExpr(0, 0, t.IDWriter1, nil, nil, nil)
|
||||
typeExprIOReader = a.NewTypeExpr(0, 0, t.IDIOReader, nil, nil, nil)
|
||||
typeExprIOWriter = a.NewTypeExpr(0, 0, t.IDIOWriter, nil, nil, nil)
|
||||
typeExprImageConfig = a.NewTypeExpr(0, 0, t.IDImageConfig, nil, nil, nil)
|
||||
|
||||
typeExprSliceU8 = a.NewTypeExpr(t.IDColon, 0, 0, nil, nil, typeExprU8)
|
||||
@@ -66,8 +66,8 @@ var builtInTypeMap = typeMap{
|
||||
t.IDU64: typeExprU64,
|
||||
t.IDBool: typeExprBool,
|
||||
t.IDStatus: typeExprStatus,
|
||||
t.IDReader1: typeExprReader1,
|
||||
t.IDWriter1: typeExprWriter1,
|
||||
t.IDIOReader: typeExprIOReader,
|
||||
t.IDIOWriter: typeExprIOWriter,
|
||||
t.IDImageConfig: typeExprImageConfig,
|
||||
}
|
||||
|
||||
|
||||
+9
-18
@@ -282,12 +282,9 @@ const (
|
||||
KeyU16 = Key(IDU16 >> KeyShift)
|
||||
KeyU32 = Key(IDU32 >> KeyShift)
|
||||
KeyU64 = Key(IDU64 >> KeyShift)
|
||||
KeyUsize = Key(IDUsize >> KeyShift) // TODO: unused?
|
||||
KeyBool = Key(IDBool >> KeyShift)
|
||||
KeyBuf1 = Key(IDBuf1 >> KeyShift) // TODO: unused?
|
||||
KeyReader1 = Key(IDReader1 >> KeyShift)
|
||||
KeyWriter1 = Key(IDWriter1 >> KeyShift)
|
||||
KeyBuf2 = Key(IDBuf2 >> KeyShift) // TODO: unused?
|
||||
KeyIOReader = Key(IDIOReader >> KeyShift)
|
||||
KeyIOWriter = Key(IDIOWriter >> KeyShift)
|
||||
KeyStatus = Key(IDStatus >> KeyShift)
|
||||
KeyImageConfig = Key(IDImageConfig >> KeyShift)
|
||||
|
||||
@@ -474,14 +471,11 @@ const (
|
||||
IDU16 = ID(0x85<<KeyShift | FlagsIdent | FlagsImplicitSemicolon | FlagsNumType)
|
||||
IDU32 = ID(0x86<<KeyShift | FlagsIdent | FlagsImplicitSemicolon | FlagsNumType)
|
||||
IDU64 = ID(0x87<<KeyShift | FlagsIdent | FlagsImplicitSemicolon | FlagsNumType)
|
||||
IDUsize = ID(0x88<<KeyShift | FlagsIdent | FlagsImplicitSemicolon | FlagsNumType)
|
||||
IDBool = ID(0x89<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDBuf1 = ID(0x8A<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDReader1 = ID(0x8B<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDWriter1 = ID(0x8C<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDBuf2 = ID(0x8D<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDStatus = ID(0x8E<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDImageConfig = ID(0x8F<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDBool = ID(0x88<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDIOReader = ID(0x89<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDIOWriter = ID(0x8A<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDStatus = ID(0x8B<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDImageConfig = ID(0x8C<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
|
||||
IDMark = ID(0x90<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
IDReadU8 = ID(0x91<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
|
||||
@@ -688,12 +682,9 @@ var builtInsByKey = [nBuiltInKeys]struct {
|
||||
KeyU16: {"u16", IDU16},
|
||||
KeyU32: {"u32", IDU32},
|
||||
KeyU64: {"u64", IDU64},
|
||||
KeyUsize: {"usize", IDUsize},
|
||||
KeyBool: {"bool", IDBool},
|
||||
KeyBuf1: {"buf1", IDBuf1},
|
||||
KeyReader1: {"reader1", IDReader1},
|
||||
KeyWriter1: {"writer1", IDWriter1},
|
||||
KeyBuf2: {"buf2", IDBuf2},
|
||||
KeyIOReader: {"io_reader", IDIOReader},
|
||||
KeyIOWriter: {"io_writer", IDIOWriter},
|
||||
KeyStatus: {"status", IDStatus},
|
||||
KeyImageConfig: {"image_config", IDImageConfig},
|
||||
|
||||
|
||||
Reference in new issue
Block a user