mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Add choosy
This commit is contained in:
1 parent
1b83476575
commit
81c6437e09
8 files changed
+223
-49
No files matched your search
@@ -9,6 +9,7 @@
|
||||
- Added `auxiliary` code.
|
||||
- Added `base` library support for UTF-8.
|
||||
- Added `base` library support for `atoi`-like string conversion.
|
||||
- Added `choose` and `choosy`.
|
||||
- Added `doc/logo`.
|
||||
- Added `endwhile` syntax.
|
||||
- Added `example/cbor-to-json`.
|
||||
|
||||
+41
-11
@@ -1063,22 +1063,32 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error {
|
||||
continue
|
||||
}
|
||||
o := tld.AsFunc()
|
||||
if o.Receiver() != n.QID() || !o.Effect().Coroutine() {
|
||||
if o.Receiver() != n.QID() {
|
||||
continue
|
||||
}
|
||||
k := g.funks[o.QQID()]
|
||||
if k.coroSuspPoint == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
if needEmptyLine {
|
||||
needEmptyLine = false
|
||||
b.writeb('\n')
|
||||
} else if o.Effect().Coroutine() {
|
||||
k := g.funks[o.QQID()]
|
||||
if k.coroSuspPoint == 0 {
|
||||
continue
|
||||
}
|
||||
if needEmptyLine {
|
||||
needEmptyLine = false
|
||||
b.writeb('\n')
|
||||
}
|
||||
b.printf("uint32_t %s%s[%d];\n", pPrefix, o.FuncName().Str(g.tm), maxDepth)
|
||||
|
||||
} else if o.Choosy() {
|
||||
if needEmptyLine {
|
||||
needEmptyLine = false
|
||||
b.writeb('\n')
|
||||
}
|
||||
if err := g.writeFuncSignature(b, o, wfsCFuncPtrFieldChoosy); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n")
|
||||
}
|
||||
b.printf("uint32_t %s%s[%d];\n", pPrefix, o.FuncName().Str(g.tm), maxDepth)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
b.writes("} private_impl;\n\n")
|
||||
|
||||
@@ -1385,6 +1395,26 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
|
||||
b.writes(" }\n")
|
||||
b.writes("}\n\n")
|
||||
|
||||
// Initialize any choosy function pointers.
|
||||
hasChoosy := false
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KFunc {
|
||||
continue
|
||||
}
|
||||
o := tld.AsFunc()
|
||||
if (o.Receiver() != n.QID()) || !o.Choosy() {
|
||||
continue
|
||||
}
|
||||
hasChoosy = true
|
||||
b.printf("self->private_impl.choosy_%s = &%s__choosy_default;\n",
|
||||
o.FuncName().Str(g.tm), g.funcCName(o))
|
||||
}
|
||||
}
|
||||
if hasChoosy {
|
||||
b.writes("\n")
|
||||
}
|
||||
|
||||
// Call any ctors on sub-structs.
|
||||
for _, f := range n.Fields() {
|
||||
f := f.AsField()
|
||||
|
||||
+47
-11
@@ -79,10 +79,12 @@ func (g *gen) funcCName(n *a.Func) string {
|
||||
|
||||
// writeFunctionSignature modes.
|
||||
const (
|
||||
wfsCDecl = 0
|
||||
wfsCppDecl = 1
|
||||
wfsCFuncPtrField = 2
|
||||
wfsCFuncPtrType = 3
|
||||
wfsCDecl = 0
|
||||
wfsCDeclChoosy = 1
|
||||
wfsCppDecl = 2
|
||||
wfsCFuncPtrField = 3
|
||||
wfsCFuncPtrFieldChoosy = 4
|
||||
wfsCFuncPtrType = 5
|
||||
)
|
||||
|
||||
func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
@@ -94,10 +96,13 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
b.writes("static ")
|
||||
}
|
||||
|
||||
case wfsCDeclChoosy:
|
||||
b.writes("static ")
|
||||
|
||||
case wfsCppDecl:
|
||||
b.writes(" inline ")
|
||||
|
||||
case wfsCFuncPtrField, wfsCFuncPtrType:
|
||||
case wfsCFuncPtrField, wfsCFuncPtrFieldChoosy, wfsCFuncPtrType:
|
||||
// No-op.
|
||||
}
|
||||
|
||||
@@ -112,18 +117,21 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
}
|
||||
|
||||
switch wfs {
|
||||
case wfsCDecl:
|
||||
case wfsCDecl, wfsCDeclChoosy:
|
||||
b.writes("\n")
|
||||
case wfsCppDecl:
|
||||
b.writes("\n ")
|
||||
case wfsCFuncPtrField:
|
||||
case wfsCFuncPtrField, wfsCFuncPtrFieldChoosy:
|
||||
b.writes(" ")
|
||||
}
|
||||
|
||||
comma := false
|
||||
switch wfs {
|
||||
case wfsCDecl:
|
||||
case wfsCDecl, wfsCDeclChoosy:
|
||||
b.writes(g.funcCName(n))
|
||||
if wfs == wfsCDeclChoosy {
|
||||
b.writes("__choosy_default")
|
||||
}
|
||||
b.writeb('(')
|
||||
if r := n.Receiver(); !r.IsZero() {
|
||||
b.writes("\n ")
|
||||
@@ -141,20 +149,29 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
b.writes("\n ")
|
||||
}
|
||||
|
||||
case wfsCFuncPtrField, wfsCFuncPtrType:
|
||||
case wfsCFuncPtrField, wfsCFuncPtrFieldChoosy, wfsCFuncPtrType:
|
||||
b.writes("(*")
|
||||
if wfs == wfsCFuncPtrField {
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
b.writes(")(\n ")
|
||||
} else if wfs == wfsCFuncPtrFieldChoosy {
|
||||
b.writes("choosy_")
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
b.writes(")(\n ")
|
||||
} else {
|
||||
b.writes(")(")
|
||||
}
|
||||
|
||||
if n.Effect().Pure() {
|
||||
b.writes("const ")
|
||||
}
|
||||
b.writes("void*")
|
||||
|
||||
if wfs == wfsCFuncPtrField {
|
||||
b.writes(" self")
|
||||
b.writes("void* self")
|
||||
} else if wfs == wfsCFuncPtrFieldChoosy {
|
||||
b.printf("%s%s* self", g.pkgPrefix, n.Receiver()[1].Str(g.tm))
|
||||
} else {
|
||||
b.writes("void*")
|
||||
}
|
||||
comma = true
|
||||
}
|
||||
@@ -189,6 +206,12 @@ func (g *gen) writeFuncPrototype(b *buffer, n *a.Func) error {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n\n")
|
||||
if n.Choosy() {
|
||||
if err := g.writeFuncSignature(b, n, wfsCDeclChoosy); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n\n")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -201,6 +224,19 @@ func (g *gen) writeFuncImpl(b *buffer, n *a.Func) error {
|
||||
}
|
||||
b.writes(" {\n")
|
||||
|
||||
if n.Choosy() {
|
||||
b.printf("return (*self->private_impl.choosy_%s)(self", n.FuncName().Str(g.tm))
|
||||
for _, o := range n.In().Fields() {
|
||||
b.printf(", %s%s", aPrefix, o.AsField().Name().Str(g.tm))
|
||||
}
|
||||
b.writes(");\n}\n\n")
|
||||
|
||||
if err := g.writeFuncSignature(b, n, wfsCDeclChoosy); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(" {\n")
|
||||
}
|
||||
|
||||
if (len(n.Body()) != 0) || n.Effect().Coroutine() || (n.Out() != nil) {
|
||||
b.writex(k.bPrologue)
|
||||
if n.Effect().Coroutine() {
|
||||
|
||||
@@ -103,6 +103,7 @@ const (
|
||||
FlagsSubExprHasEffect = Flags(0x00002000)
|
||||
FlagsRetsError = Flags(0x00004000)
|
||||
FlagsPrivateData = Flags(0x00008000)
|
||||
FlagsChoosy = Flags(0x00010000)
|
||||
)
|
||||
|
||||
func (f Flags) AsEffect() Effect { return Effect(f) }
|
||||
@@ -869,6 +870,7 @@ const MaxBodyDepth = 255
|
||||
type Func Node
|
||||
|
||||
func (n *Func) AsNode() *Node { return (*Node)(n) }
|
||||
func (n *Func) Choosy() bool { return n.flags&FlagsChoosy != 0 }
|
||||
func (n *Func) Effect() Effect { return Effect(n.flags) }
|
||||
func (n *Func) Public() bool { return n.flags&FlagsPublic != 0 }
|
||||
func (n *Func) Filename() string { return n.filename }
|
||||
|
||||
+20
-1
@@ -217,7 +217,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
|
||||
return nil, err
|
||||
}
|
||||
out := (*a.TypeExpr)(nil)
|
||||
if p.peek1() != t.IDOpenCurly {
|
||||
if x := p.peek1(); (x != t.IDOpenCurly) && (x != t.IDComma) {
|
||||
out, err = p.parseTypeExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -226,6 +226,25 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
|
||||
asserts := []*a.Node(nil)
|
||||
if p.peek1() == t.IDComma {
|
||||
p.src = p.src[1:]
|
||||
if p.peek1() == t.IDChoosy {
|
||||
p.src = p.src[1:]
|
||||
if (flags & a.FlagsPublic) != 0 {
|
||||
return nil, fmt.Errorf(`parse: choosy function cannot be pub at %s:%d`,
|
||||
p.filename, p.line())
|
||||
} else if p.funcEffect.Coroutine() {
|
||||
return nil, fmt.Errorf(`parse: choosy function cannot be a coroutine at %s:%d`,
|
||||
p.filename, p.line())
|
||||
}
|
||||
flags |= a.FlagsChoosy
|
||||
if p.peek1() != t.IDOpenCurly {
|
||||
if x := p.peek1(); x != t.IDComma {
|
||||
return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`,
|
||||
p.tm.ByID(x), p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
}
|
||||
}
|
||||
|
||||
asserts, err = p.parseList(t.IDOpenCurly, (*parser).parseAssertNode)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
+26
-22
@@ -375,28 +375,30 @@ const (
|
||||
|
||||
IDAssert = ID(0xB0)
|
||||
IDBreak = ID(0xB1)
|
||||
IDConst = ID(0xB2)
|
||||
IDContinue = ID(0xB3)
|
||||
IDElse = ID(0xB4)
|
||||
IDEndwhile = ID(0xB5)
|
||||
IDFunc = ID(0xB6)
|
||||
IDIOBind = ID(0xB7)
|
||||
IDIOLimit = ID(0xB8)
|
||||
IDIf = ID(0xB9)
|
||||
IDImplements = ID(0xBA)
|
||||
IDInv = ID(0xBB)
|
||||
IDIterate = ID(0xBC)
|
||||
IDPost = ID(0xBD)
|
||||
IDPre = ID(0xBE)
|
||||
IDPri = ID(0xBF)
|
||||
IDPub = ID(0xC0)
|
||||
IDReturn = ID(0xC1)
|
||||
IDStruct = ID(0xC2)
|
||||
IDUse = ID(0xC3)
|
||||
IDVar = ID(0xC4)
|
||||
IDVia = ID(0xC5)
|
||||
IDWhile = ID(0xC6)
|
||||
IDYield = ID(0xC7)
|
||||
IDChoose = ID(0xB2)
|
||||
IDChoosy = ID(0xB3)
|
||||
IDConst = ID(0xB4)
|
||||
IDContinue = ID(0xB5)
|
||||
IDElse = ID(0xB6)
|
||||
IDEndwhile = ID(0xB7)
|
||||
IDFunc = ID(0xB8)
|
||||
IDIOBind = ID(0xB9)
|
||||
IDIOLimit = ID(0xBA)
|
||||
IDIf = ID(0xBB)
|
||||
IDImplements = ID(0xBC)
|
||||
IDInv = ID(0xBD)
|
||||
IDIterate = ID(0xBE)
|
||||
IDPost = ID(0xBF)
|
||||
IDPre = ID(0xC0)
|
||||
IDPri = ID(0xC1)
|
||||
IDPub = ID(0xC2)
|
||||
IDReturn = ID(0xC3)
|
||||
IDStruct = ID(0xC4)
|
||||
IDUse = ID(0xC5)
|
||||
IDVar = ID(0xC6)
|
||||
IDVia = ID(0xC7)
|
||||
IDWhile = ID(0xC8)
|
||||
IDYield = ID(0xC9)
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -743,6 +745,8 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
|
||||
IDAssert: "assert",
|
||||
IDBreak: "break",
|
||||
IDChoose: "choose",
|
||||
IDChoosy: "choosy",
|
||||
IDConst: "const",
|
||||
IDContinue: "continue",
|
||||
IDElse: "else",
|
||||
|
||||
@@ -8356,6 +8356,21 @@ struct wuffs_png__decoder__struct {
|
||||
uint64_t f_frame_config_io_position;
|
||||
wuffs_base__pixel_swizzler f_swizzler;
|
||||
|
||||
wuffs_base__empty_struct (*choosy_filter_1)(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr);
|
||||
wuffs_base__empty_struct (*choosy_filter_2)(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
wuffs_base__empty_struct (*choosy_filter_3)(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
wuffs_base__empty_struct (*choosy_filter_4)(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
uint32_t p_decode_image_config[1];
|
||||
uint32_t p_decode_plte[1];
|
||||
uint32_t p_decode_frame_config[1];
|
||||
@@ -29830,24 +29845,47 @@ wuffs_png__decoder__filter_1(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_1__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_2(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_2__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_3(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_3__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_4(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_4__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev);
|
||||
|
||||
static wuffs_base__status
|
||||
wuffs_png__decoder__decode_plte(
|
||||
wuffs_png__decoder* self,
|
||||
@@ -29936,6 +29974,11 @@ wuffs_png__decoder__initialize(
|
||||
}
|
||||
}
|
||||
|
||||
self->private_impl.choosy_filter_1 = &wuffs_png__decoder__filter_1__choosy_default;
|
||||
self->private_impl.choosy_filter_2 = &wuffs_png__decoder__filter_2__choosy_default;
|
||||
self->private_impl.choosy_filter_3 = &wuffs_png__decoder__filter_3__choosy_default;
|
||||
self->private_impl.choosy_filter_4 = &wuffs_png__decoder__filter_4__choosy_default;
|
||||
|
||||
{
|
||||
wuffs_base__status z = wuffs_crc32__ieee_hasher__initialize(
|
||||
&self->private_data.f_crc, sizeof(self->private_data.f_crc), WUFFS_VERSION, options);
|
||||
@@ -29986,6 +30029,13 @@ static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_1(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr) {
|
||||
return (*self->private_impl.choosy_filter_1)(self, a_curr);
|
||||
}
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_1__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr) {
|
||||
uint64_t v_filter_distance = 0;
|
||||
uint8_t v_fa = 0;
|
||||
uint64_t v_i_start = 0;
|
||||
@@ -30013,6 +30063,14 @@ wuffs_png__decoder__filter_2(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
return (*self->private_impl.choosy_filter_2)(self, a_curr, a_prev);
|
||||
}
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_2__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
uint64_t v_n = 0;
|
||||
uint64_t v_i = 0;
|
||||
|
||||
@@ -30032,6 +30090,14 @@ wuffs_png__decoder__filter_3(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
return (*self->private_impl.choosy_filter_3)(self, a_curr, a_prev);
|
||||
}
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_3__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
uint64_t v_filter_distance = 0;
|
||||
uint64_t v_n = 0;
|
||||
uint64_t v_i = 0;
|
||||
@@ -30066,6 +30132,14 @@ wuffs_png__decoder__filter_4(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
return (*self->private_impl.choosy_filter_4)(self, a_curr, a_prev);
|
||||
}
|
||||
|
||||
static wuffs_base__empty_struct
|
||||
wuffs_png__decoder__filter_4__choosy_default(
|
||||
wuffs_png__decoder* self,
|
||||
wuffs_base__slice_u8 a_curr,
|
||||
wuffs_base__slice_u8 a_prev) {
|
||||
uint64_t v_filter_distance = 0;
|
||||
uint64_t v_n = 0;
|
||||
uint64_t v_i = 0;
|
||||
|
||||
@@ -12,7 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
pri func decoder.filter_1!(curr: slice base.u8) {
|
||||
pri func decoder.filter_1!(curr: slice base.u8),
|
||||
choosy,
|
||||
{
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var fa : base.u8
|
||||
var i_start : base.u64
|
||||
@@ -35,7 +37,9 @@ pri func decoder.filter_1!(curr: slice base.u8) {
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
|
||||
pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8),
|
||||
choosy,
|
||||
{
|
||||
var n : base.u64
|
||||
var i : base.u64
|
||||
|
||||
@@ -53,7 +57,9 @@ pri func decoder.filter_2!(curr: slice base.u8, prev: slice base.u8) {
|
||||
} endwhile
|
||||
}
|
||||
|
||||
pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
|
||||
pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8),
|
||||
choosy,
|
||||
{
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var n : base.u64
|
||||
var i : base.u64
|
||||
@@ -106,7 +112,9 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) {
|
||||
}
|
||||
}
|
||||
|
||||
pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) {
|
||||
pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8),
|
||||
choosy,
|
||||
{
|
||||
var filter_distance : base.u64[..= 8]
|
||||
var n : base.u64
|
||||
var i : base.u64
|
||||
|
||||
Reference in new issue
Block a user