mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Delegate etc__status__string to used packages
This commit is contained in:
1 parent
fecd7b631c
commit
7e47f4cc7a
3 files changed
+44
-12
No files matched your search
@@ -23,6 +23,7 @@ import (
|
||||
"math/big"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
@@ -161,17 +162,20 @@ type gen struct {
|
||||
pkgPrefix string // e.g. "wuffs_jpeg__"
|
||||
pkgName string // e.g. "jpeg"
|
||||
|
||||
tm *t.Map
|
||||
checker *check.Checker
|
||||
files []*a.File
|
||||
tm *t.Map
|
||||
checker *check.Checker
|
||||
files []*a.File
|
||||
|
||||
statusList []status
|
||||
statusMap map[t.ID]status
|
||||
structList []*a.Struct
|
||||
structMap map[t.ID]*a.Struct
|
||||
currFunk funk
|
||||
funks map[t.QID]funk
|
||||
wuffsRoot string
|
||||
usesSeen map[string]struct{}
|
||||
usesList []string
|
||||
usesMap map[string]struct{}
|
||||
|
||||
currFunk funk
|
||||
funks map[t.QID]funk
|
||||
wuffsRoot string
|
||||
}
|
||||
|
||||
func (g *gen) generate() ([]byte, error) {
|
||||
@@ -322,7 +326,12 @@ func (g *gen) genImpl(b *buffer) error {
|
||||
b.printf("case 0: a = %sstatus__strings0; n = %d; break;\n", g.pkgPrefix, len(builtin.StatusList))
|
||||
b.printf("case %spackageid: a = %sstatus__strings1; n = %d; break;\n",
|
||||
g.pkgPrefix, g.pkgPrefix, len(g.statusList))
|
||||
// TODO: add cases for other packages used by this one.
|
||||
for _, u := range g.usesList {
|
||||
// TODO: is path.Base always correct? Should we check
|
||||
// validName(packageName)?
|
||||
useePkgName := path.Base(u)
|
||||
b.printf("case wuffs_%s__packageid: return wuffs_%s__status__string(s);\n", useePkgName, useePkgName)
|
||||
}
|
||||
b.printf("}\n")
|
||||
b.printf("uint32_t i = s & 0x%X;\n", 1<<statusCodeCodeBits-1)
|
||||
b.printf("return i < n ? a[i] : \"%s: unknown status\";\n", g.pkgName)
|
||||
@@ -593,12 +602,13 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error {
|
||||
|
||||
// TODO: sanity check useDirname via commonflags.IsValidUsePath?
|
||||
|
||||
if g.usesSeen == nil {
|
||||
g.usesSeen = map[string]struct{}{}
|
||||
} else if _, ok := g.usesSeen[useDirname]; ok {
|
||||
if g.usesMap == nil {
|
||||
g.usesMap = map[string]struct{}{}
|
||||
} else if _, ok := g.usesMap[useDirname]; ok {
|
||||
return nil
|
||||
}
|
||||
g.usesSeen[useDirname] = struct{}{}
|
||||
g.usesList = append(g.usesList, useDirname)
|
||||
g.usesMap[useDirname] = struct{}{}
|
||||
|
||||
if g.wuffsRoot == "" {
|
||||
var err error
|
||||
|
||||
@@ -788,6 +788,8 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
|
||||
a = wuffs_zlib__status__strings1;
|
||||
n = 5;
|
||||
break;
|
||||
case wuffs_deflate__packageid:
|
||||
return wuffs_deflate__status__string(s);
|
||||
}
|
||||
uint32_t i = s & 0xFF;
|
||||
return i < n ? a[i] : "zlib: unknown status";
|
||||
|
||||
@@ -67,6 +67,21 @@ golden_test zlib_pi_gt = {
|
||||
.src_filename = "../../testdata/pi.txt.zlib", //
|
||||
};
|
||||
|
||||
// ---------------- Basic Tests
|
||||
|
||||
void test_basic_status_used_package() {
|
||||
CHECK_FOCUS(__func__);
|
||||
// The function call here is from "std/zlib" but the argument is from
|
||||
// "std/deflate". The former package depends on the latter.
|
||||
const char* s0 =
|
||||
wuffs_zlib__status__string(WUFFS_DEFLATE__ERROR_BAD_DISTANCE);
|
||||
const char* t0 = "deflate: bad distance";
|
||||
if (strcmp(s0, t0)) {
|
||||
FAIL("got \"%s\", want \"%s\"", s0, t0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- Adler32 Tests
|
||||
|
||||
void test_wuffs_adler32() {
|
||||
@@ -300,6 +315,11 @@ void bench_mimic_zlib_decode_100k() {
|
||||
// The empty comments forces clang-format to place one element per line.
|
||||
proc tests[] = {
|
||||
|
||||
// These basic tests are really testing the Wuffs compiler. They aren't
|
||||
// specific to the std/zlib code, but putting them here is as good as any
|
||||
// other place.
|
||||
test_basic_status_used_package, //
|
||||
|
||||
test_wuffs_adler32, //
|
||||
|
||||
test_wuffs_zlib_checksum_mismatch, //
|
||||
|
||||
Reference in new issue
Block a user