mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 08:47:28 +01:00
Generate C status codes.
This commit is contained in:
1 parent
1d1f3bd46d
commit
a1dd73a58c
6 files changed
+56
-16
No files matched your search
@@ -31,6 +31,13 @@ func (g *Generator) Generate(packageName string, m *t.IDMap, files []*a.File) ([
|
||||
b.WriteString("#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
|
||||
}
|
||||
|
||||
// Write status codes.
|
||||
b.WriteString("typedef enum {\n")
|
||||
fmt.Fprintf(b, "puffs_%s_status_ok = 0,\n", packageName)
|
||||
fmt.Fprintf(b, "puffs_%s_status_short_dst = -1,\n", packageName)
|
||||
fmt.Fprintf(b, "puffs_%s_status_short_src = -2,\n", packageName)
|
||||
fmt.Fprintf(b, "} puffs_%s_status;\n\n", packageName)
|
||||
|
||||
// Write structs.
|
||||
for _, f := range files {
|
||||
for _, n := range f.TopLevelDecls() {
|
||||
@@ -52,6 +59,9 @@ func (g *Generator) Generate(packageName string, m *t.IDMap, files []*a.File) ([
|
||||
|
||||
func writeStruct(b *bytes.Buffer, packageName string, m *t.IDMap, n *a.Struct) error {
|
||||
fmt.Fprintf(b, "typedef struct {\n")
|
||||
if n.Suspendible() {
|
||||
fmt.Fprintf(b, "puffs_%s_status status;\n", packageName)
|
||||
}
|
||||
for _, f := range n.Fields() {
|
||||
if err := writeField(b, m, f.Field()); err != nil {
|
||||
return err
|
||||
@@ -86,6 +96,7 @@ func writeField(b *bytes.Buffer, m *t.IDMap, n *a.Field) error {
|
||||
return fmt.Errorf("cannot convert Puffs type %q to C", n.XType().String(m))
|
||||
}
|
||||
|
||||
b.WriteString("f_")
|
||||
b.WriteString(n.Name().String(m))
|
||||
|
||||
for x := n.XType(); x != nil; x = x.Inner() {
|
||||
|
||||
@@ -100,6 +100,10 @@ func genDir(puffsRoot string, dirname string, filenames []string, langs []string
|
||||
combinedSrc := buf.Bytes()
|
||||
|
||||
packageName := filepath.Base(dirname)
|
||||
if !validName(packageName) {
|
||||
return fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName)
|
||||
}
|
||||
|
||||
for _, lang := range langs {
|
||||
command := "puffs-gen-" + lang
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
+13
-7
@@ -106,16 +106,22 @@ const langsUsage = `comma-separated list of target languages (file extensions),
|
||||
func parseLangs(commaSeparated string) ([]string, error) {
|
||||
ret := []string(nil)
|
||||
for _, s := range strings.Split(commaSeparated, ",") {
|
||||
if len(s) == 0 {
|
||||
return nil, fmt.Errorf(`invalid empty lang ""`)
|
||||
}
|
||||
for _, c := range s {
|
||||
if ('0' <= c && c <= '9') || ('a' <= c && c <= 'z') {
|
||||
continue
|
||||
}
|
||||
if !validName(s) {
|
||||
return nil, fmt.Errorf(`invalid lang %q, not in [a-z0-9]+`, s)
|
||||
}
|
||||
ret = append(ret, s)
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func validName(s string) bool {
|
||||
if len(s) == 0 {
|
||||
return false
|
||||
}
|
||||
for _, c := range s {
|
||||
if (c < '0' || '9' < c) && (c < 'a' || 'z' < c) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
+6
-1
@@ -79,9 +79,14 @@ func test(puffsRoot, dirname string, langs []string, recursive bool) (failed boo
|
||||
}
|
||||
|
||||
func testDir(puffsRoot string, dirname string, langs []string) (failed bool, err error) {
|
||||
packageName := filepath.Base(dirname)
|
||||
if !validName(packageName) {
|
||||
return false, fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName)
|
||||
}
|
||||
|
||||
for _, lang := range langs {
|
||||
command := "puffs-test-" + lang
|
||||
testDirname := filepath.Join(puffsRoot, "test", lang, filepath.Base(dirname))
|
||||
testDirname := filepath.Join(puffsRoot, "test", lang, packageName)
|
||||
fmt.Println("test: ", testDirname)
|
||||
cmd := exec.Command(command, testDirname)
|
||||
cmd.Stdout = os.Stdout
|
||||
|
||||
+11
-4
@@ -14,9 +14,16 @@
|
||||
#error "Puffs requires a word size of at least 32 bits"
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
puffs_gif_status_ok = 0,
|
||||
puffs_gif_status_short_dst = -1,
|
||||
puffs_gif_status_short_src = -2,
|
||||
} puffs_gif_status;
|
||||
|
||||
typedef struct {
|
||||
uint32_t literal_width;
|
||||
uint8_t stack[4096];
|
||||
uint8_t suffixes[4096];
|
||||
uint16_t prefixes[4096];
|
||||
puffs_gif_status status;
|
||||
uint32_t f_literal_width;
|
||||
uint8_t f_stack[4096];
|
||||
uint8_t f_suffixes[4096];
|
||||
uint16_t f_prefixes[4096];
|
||||
} puffs_gif_lzw_decoder;
|
||||
+11
-4
@@ -18,11 +18,18 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
puffs_gif_status_ok = 0,
|
||||
puffs_gif_status_short_dst = -1,
|
||||
puffs_gif_status_short_src = -2,
|
||||
} puffs_gif_status;
|
||||
|
||||
typedef struct {
|
||||
uint32_t literal_width;
|
||||
uint8_t stack[4096];
|
||||
uint8_t suffixes[4096];
|
||||
uint16_t prefixes[4096];
|
||||
puffs_gif_status status;
|
||||
uint32_t f_literal_width;
|
||||
uint8_t f_stack[4096];
|
||||
uint8_t f_suffixes[4096];
|
||||
uint16_t f_prefixes[4096];
|
||||
} puffs_gif_lzw_decoder;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in new issue
Block a user