mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
Generate C structs.
This commit is contained in:
1 parent
7e18d9b549
commit
d7403b8e57
8 files changed
+146
-46
No files matched your search
+19
-9
@@ -11,6 +11,12 @@ import (
|
||||
t "github.com/google/puffs/lang/token"
|
||||
)
|
||||
|
||||
type Flags uint32
|
||||
|
||||
const (
|
||||
FlagsOnlyTypeCheck = Flags(0x0001)
|
||||
)
|
||||
|
||||
type Error struct {
|
||||
Err error
|
||||
Filename string
|
||||
@@ -65,7 +71,7 @@ type Func struct {
|
||||
LocalVars TypeMap
|
||||
}
|
||||
|
||||
func Check(m *t.IDMap, files ...*a.File) (*Checker, error) {
|
||||
func Check(m *t.IDMap, flags Flags, files ...*a.File) (*Checker, error) {
|
||||
for _, f := range files {
|
||||
if f == nil {
|
||||
return nil, errors.New("check: Check given a nil *ast.File")
|
||||
@@ -89,6 +95,7 @@ func Check(m *t.IDMap, files ...*a.File) (*Checker, error) {
|
||||
}
|
||||
}
|
||||
c := &Checker{
|
||||
flags: flags,
|
||||
idMap: m,
|
||||
reasonMap: rMap,
|
||||
structs: map[t.ID]Struct{},
|
||||
@@ -123,6 +130,7 @@ var phases = [...]struct {
|
||||
}
|
||||
|
||||
type Checker struct {
|
||||
flags Flags
|
||||
idMap *t.IDMap
|
||||
reasonMap reasonMap
|
||||
structs map[t.ID]Struct
|
||||
@@ -303,14 +311,16 @@ func (c *Checker) checkFuncBody(node *a.Node) error {
|
||||
}
|
||||
|
||||
// Run bounds checks.
|
||||
for _, o := range n.Body() {
|
||||
if err := q.bcheckStatement(o); err != nil {
|
||||
return &Error{
|
||||
Err: err,
|
||||
Filename: q.errFilename,
|
||||
Line: q.errLine,
|
||||
IDMap: c.idMap,
|
||||
Facts: q.facts,
|
||||
if c.flags&FlagsOnlyTypeCheck == 0 {
|
||||
for _, o := range n.Body() {
|
||||
if err := q.bcheckStatement(o); err != nil {
|
||||
return &Error{
|
||||
Err: err,
|
||||
Filename: q.errFilename,
|
||||
Line: q.errLine,
|
||||
IDMap: c.idMap,
|
||||
Facts: q.facts,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+16
-24
@@ -4,7 +4,6 @@
|
||||
package generate
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"flag"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
@@ -18,13 +17,13 @@ import (
|
||||
|
||||
var (
|
||||
assumeAlreadyChecked = flag.Bool("assume_already_checked", false,
|
||||
"whether to skip type- and bounds-checking; unsafe unless some other program checks the inputs")
|
||||
"whether to skip bounds-checking; unsafe unless some other program checks the inputs")
|
||||
|
||||
packageName = flag.String("package_name", "", "the package name of the Puffs input code")
|
||||
)
|
||||
|
||||
type Generator interface {
|
||||
WritePreamble(w *bytes.Buffer) error
|
||||
WritePostamble(w *bytes.Buffer) error
|
||||
Format(rawSource []byte) ([]byte, error)
|
||||
Generate(packageName string, m *token.IDMap, files []*ast.File) ([]byte, error)
|
||||
}
|
||||
|
||||
func Main(g Generator) {
|
||||
@@ -43,30 +42,23 @@ func main1(g Generator) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !*assumeAlreadyChecked {
|
||||
for _, f := range files {
|
||||
if _, err := check.Check(idMap, f); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Even if we can skip the bounds-checking, we still need to type-check to
|
||||
// evaluate e.g. the constant N expression in the type "[N]u8".
|
||||
checkFlags := check.Flags(0)
|
||||
if *assumeAlreadyChecked {
|
||||
checkFlags |= check.FlagsOnlyTypeCheck
|
||||
}
|
||||
if _, err := check.Check(idMap, checkFlags, files...); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
b := &bytes.Buffer{}
|
||||
if err := g.WritePreamble(b); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, f := range files {
|
||||
// TODO: call g.WriteFoo methods.
|
||||
_ = f
|
||||
}
|
||||
if err := g.WritePostamble(b); err != nil {
|
||||
return err
|
||||
}
|
||||
formatted, err := g.Format(b.Bytes())
|
||||
out, err := g.Generate(*packageName, idMap, files)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := os.Stdout.Write(formatted); err != nil {
|
||||
|
||||
if _, err := os.Stdout.Write(out); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in new issue
Block a user