Ship as a "single file C library"

This commit is contained in:
Nigel Tao committed 2018-07-14 08:59:36 +10:00
1 parent 85c4de47b9
commit a0bafff465
45 files changed
+9655 -16510

No files matched your search

+1 -1
View File
@@ -82,7 +82,7 @@ func genObj(outDir string, inDir string, cc string, dynamism string, filenames [
out := genlibOutFilename(outDir, dynamism, filename)
args := []string(nil)
args = append(args, "-O3", "-std=c99")
args = append(args, "-O3", "-std=c99", "-DWUFFS_IMPLEMENTATION")
if dynamism == "dynamic" {
args = append(args, "-fPIC", "-DPIC")
}
+3 -1
View File
@@ -16,7 +16,7 @@
// !! INSERT base-public.h.
// !! C HEADER ENDS HERE.
#ifdef WUFFS_IMPLEMENTATION
// !! INSERT base-private.h.
@@ -31,3 +31,5 @@ const char* wuffs_base__status__string(wuffs_base__status s) {
#endif // !defined(WUFFS_CONFIG__MODULES) ||
// defined(WUFFS_CONFIG__MODULE__BASE)
#endif // WUFFS_IMPLEMENTATION
+23 -14
View File
@@ -305,10 +305,12 @@ func (g *gen) generate() ([]byte, error) {
if err := g.genHeader(b); err != nil {
return nil, err
}
b.writes("// !! C HEADER ENDS HERE.\n\n")
b.writex(wiStart)
b.writeb('\n')
if err := g.genImpl(b); err != nil {
return nil, err
}
b.writex(wiEnd)
return *b, nil
}
@@ -774,8 +776,11 @@ func (g *gen) writeCppImpls(b *buffer) error {
}
var (
wigbpStart = []byte("#ifndef WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n")
wigbpEnd = []byte("#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n")
wiStart = []byte("\n#ifdef WUFFS_IMPLEMENTATION\n")
wiEnd = []byte("\n#endif // WUFFS_IMPLEMENTATION\n")
wigbpStart = []byte("\n#ifndef WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n")
wigbpEnd = []byte("\n#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n")
)
func (g *gen) writeUse(b *buffer, n *a.Use) error {
@@ -800,30 +805,34 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error {
}
}
hdrFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".h")
hdr, err := ioutil.ReadFile(hdrFilename)
useeFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".c")
usee, err := ioutil.ReadFile(useeFilename)
if err != nil {
return err
}
if i := bytes.Index(usee, wiStart); i < 0 {
return fmt.Errorf("use %q: previously generated code %q could not be inlined", useDirname, useeFilename)
} else {
usee = usee[:i]
}
b.printf("// ---------------- BEGIN USE %q\n\n", useDirname)
// Inline the previously generated .h file, stripping out the redundant
// copy of the WUFFS_INCLUDE_GUARD__BASE_PUBLIC code.
if i := bytes.Index(hdr, wigbpStart); i < 0 {
return fmt.Errorf("use %q: previously generated header %q could not be inlined", useDirname, hdrFilename)
if i := bytes.Index(usee, wigbpStart); i < 0 {
return fmt.Errorf("use %q: previously generated code %q could not be inlined", useDirname, useeFilename)
} else {
b.Write(hdr[:i])
hdr = hdr[i+len(wigbpStart):]
b.Write(usee[:i])
usee = usee[i+len(wigbpStart):]
}
if i := bytes.Index(hdr, wigbpEnd); i < 0 {
return fmt.Errorf("use %q: previously generated header %q could not be inlined", useDirname, hdrFilename)
if i := bytes.Index(usee, wigbpEnd); i < 0 {
return fmt.Errorf("use %q: previously generated code %q could not be inlined", useDirname, useeFilename)
} else {
b.Write(hdr[i+len(wigbpEnd):])
b.Write(usee[i+len(wigbpEnd):])
}
b.writeb('\n')
b.printf("// ---------------- END USE %q\n\n", useDirname)
b.printf("\n\n// ---------------- END USE %q\n\n", useDirname)
return nil
}
+2 -2
View File
@@ -141,8 +141,8 @@ const basePrivateH = "" +
""
const baseImplC = "" +
"// Copyright 2018 The Wuffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n// !! INSERT base-public.h.\n\n// !! C HEADER ENDS HERE.\n\n// !! INSERT base-private.h.\n\n#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE)\n\n// !! INSERT wuffs_base__status__string data.\n\nconst char* wuffs_base__status__string(wuffs_base__status s) {\n uint16_t o = wuffs_base__status__string_offsets[(uint8_t)(s >> 24)];\n return o ? wuffs_base__status__string_data + o : \"unknown status\";\n}\n\n#endif // !d" +
"efined(WUFFS_CONFIG__MODULES) ||\n // defined(WUFFS_CONFIG__MODULE__BASE)\n" +
"// Copyright 2018 The Wuffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n// !! INSERT base-public.h.\n\n#ifdef WUFFS_IMPLEMENTATION\n\n// !! INSERT base-private.h.\n\n#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE)\n\n// !! INSERT wuffs_base__status__string data.\n\nconst char* wuffs_base__status__string(wuffs_base__status s) {\n uint16_t o = wuffs_base__status__string_offsets[(uint8_t)(s >> 24)];\n return o ? wuffs_base__status__string_data + o : \"unknown status\";\n}\n\n#endif // " +
"!defined(WUFFS_CONFIG__MODULES) ||\n // defined(WUFFS_CONFIG__MODULE__BASE)\n\n#endif // WUFFS_IMPLEMENTATION\n" +
""
type template_args_short_read struct {
+41 -20
View File
@@ -56,6 +56,7 @@ func doGenrelease(args []string) error {
unformatted := bytes.NewBuffer(nil)
unformatted.WriteString("#ifndef WUFFS_INCLUDE_GUARD\n")
unformatted.WriteString("#define WUFFS_INCLUDE_GUARD\n\n")
unformatted.WriteString(grSingleFileGuidance)
// First, cat all of the headers together, filtering out duplicate
// WUFFS_INCLUDE_GUARD__FOO sections and overriding WUFFS_VERSION.
@@ -65,10 +66,10 @@ func doGenrelease(args []string) error {
return err
}
if i := bytes.Index(s, grCHeader); i >= 0 {
if i := bytes.Index(s, grImplStartsHere); i >= 0 {
s = s[:i]
} else {
return fmt.Errorf("could not find %q", grCHeader)
return fmt.Errorf("could not find %q", grImplStartsHere)
}
if err := h.gen(unformatted, s); err != nil {
@@ -76,8 +77,7 @@ func doGenrelease(args []string) error {
}
}
unformatted.WriteString("\n\n#endif // WUFFS_INCLUDE_GUARD\n\n")
unformatted.Write(grCHeader)
unformatted.Write(grImplStartsHere)
unformatted.WriteString("\n")
// Then, cat all of the implementations together, filtering out duplicate
@@ -88,8 +88,14 @@ func doGenrelease(args []string) error {
return err
}
if i := bytes.Index(s, grCHeader); i >= 0 {
s = s[i+len(grCHeader):]
if i := bytes.Index(s, grImplStartsHere); i >= 0 {
s = s[i+len(grImplStartsHere):]
} else {
continue
}
if i := bytes.Index(s, grImplEndsHere); i >= 0 {
s = s[:i]
} else {
continue
}
@@ -99,6 +105,10 @@ func doGenrelease(args []string) error {
}
}
unformatted.WriteString("\n")
unformatted.Write(grImplEndsHere)
unformatted.WriteString("\n\n#endif // WUFFS_INCLUDE_GUARD\n\n")
cmd := exec.Command(*cformatterFlag, "-style=Chromium")
cmd.Stdin = unformatted
cmd.Stdout = os.Stdout
@@ -107,16 +117,27 @@ func doGenrelease(args []string) error {
}
var (
grCHeader = []byte("// !! C HEADER ENDS HERE.\n")
grNN = []byte("\n\n")
grVOverride = []byte("// !! Some code generation programs can override WUFFS_VERSION.\n")
grVString = []byte(`#define WUFFS_VERSION_STRING "0.0.0"`)
grImplStartsHere = []byte("#ifdef WUFFS_IMPLEMENTATION\n")
grImplEndsHere = []byte("#endif // WUFFS_IMPLEMENTATION\n")
grNN = []byte("\n\n")
grVOverride = []byte("// !! Some code generation programs can override WUFFS_VERSION.\n")
grVString = []byte(`#define WUFFS_VERSION_STRING "0.0.0"`)
grDefine = []byte("#define WUFFS_INCLUDE_GUARD__")
grEndif = []byte("#endif // WUFFS_INCLUDE_GUARD__")
grIfndef = []byte("#ifndef WUFFS_INCLUDE_GUARD__")
grWigDefine = []byte("#define WUFFS_INCLUDE_GUARD__")
grWigEndif = []byte("#endif // WUFFS_INCLUDE_GUARD__")
grWigIfndef = []byte("#ifndef WUFFS_INCLUDE_GUARD__")
)
const grSingleFileGuidance = `
// Wuffs ships as a "single file C library" or "header file library" as per
// https://github.com/nothings/stb/blob/master/docs/stb_howto.txt
//
// To use that single file as a "foo.c"-like implementation, instead of a
// "foo.h"-like header, #define WUFFS_IMPLEMENTATION before #include'ing or
// compiling it.
`
type genReleaseHelper struct {
seen map[string]bool
revision string
@@ -137,8 +158,8 @@ func (h *genReleaseHelper) gen(w *bytes.Buffer, s []byte) error {
if s[0] == '#' {
switch {
case bytes.HasPrefix(s, grIfndef):
pkg := string(s[len(grIfndef):])
case bytes.HasPrefix(s, grWigIfndef):
pkg := string(s[len(grWigIfndef):])
for _, p := range stack {
if p == pkg {
return fmt.Errorf("unexpected %q", s)
@@ -152,15 +173,15 @@ func (h *genReleaseHelper) gen(w *bytes.Buffer, s []byte) error {
stack = append(stack, pkg)
continue
case bytes.HasPrefix(s, grDefine):
pkg := string(s[len(grDefine):])
case bytes.HasPrefix(s, grWigDefine):
pkg := string(s[len(grWigDefine):])
if (len(stack) == 0) || (stack[len(stack)-1] != pkg) {
return fmt.Errorf("unexpected %q", s)
}
continue
case bytes.HasPrefix(s, grEndif):
pkg := string(s[len(grEndif):])
case bytes.HasPrefix(s, grWigEndif):
pkg := string(s[len(grWigEndif):])
if (len(stack) == 0) || (stack[len(stack)-1] != pkg) {
return fmt.Errorf("unexpected %q", s)
}
@@ -196,7 +217,7 @@ func (h *genReleaseHelper) gen(w *bytes.Buffer, s []byte) error {
}
if len(stack) != 0 {
return fmt.Errorf("unmatched %q", string(grIfndef)+stack[len(stack)-1])
return fmt.Errorf("unmatched %q", string(grWigIfndef)+stack[len(stack)-1])
}
return nil
}
+5 -15
View File
@@ -175,21 +175,13 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
return err
}
out := stdout.Bytes()
if err := h.genFile(dirname, lang, lang, out); err != nil {
return err
suffix := lang
if suffix == "c" {
// TODO: suffix = "h"
}
// Special-case the "c" generator to also write a .h file.
if lang != "c" || packageName == "base" {
continue
}
if i := bytes.Index(out, cHeaderEndsHere); i >= 0 {
out = out[:i]
} else {
return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere)
}
if err := h.genFile(dirname, "c", "h", out); err != nil {
if err := h.genFile(dirname, lang, suffix, out); err != nil {
return err
}
}
@@ -201,8 +193,6 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
return nil
}
var cHeaderEndsHere = []byte("\n// !! C HEADER ENDS HERE.\n\n")
func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error {
files, err := generate.ParseFiles(&h.tm, qualifiedFilenames, nil)
if err != nil {
+9 -17
View File
@@ -64,21 +64,6 @@ func doGenrelease(wuffsRoot string, args []string) error {
if err := writeFile(filename, contents); err != nil {
return err
}
// Special-case the "c" generator to also write a .h file.
if lang != "c" {
continue
}
filename = filename[:len(filename)-1] + "h"
if i := bytes.Index(contents, cHeaderEndsHere); i >= 0 {
contents = contents[:i]
} else {
return fmt.Errorf("wuffs-c output did not contain %q", cHeaderEndsHere)
}
if err := writeFile(filename, contents); err != nil {
return err
}
}
return nil
}
@@ -106,8 +91,15 @@ func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string)
return "", nil, err
}
wv := fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor)
return filepath.Join(wuffsRoot, "release", lang, wv, wv+"."+lang), stdout.Bytes(), nil
base := "unsupported-snapshot"
if v.Major != 0 || v.Minor != 0 {
base = fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor)
}
ext := lang
if ext == "c" {
ext = "h"
}
return filepath.Join(wuffsRoot, "release", lang, base+"."+ext), stdout.Bytes(), nil
}
func findRevision(wuffsRoot string) string {