mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 16:47:28 +01:00
Remove check.FlagsOnlyTypeCheck.
The puffs-gen-foo commands might need to bounds check anyway, to e.g. generate different code paths depending on whether a u64 typed expression fits in a usize's range.
This commit is contained in:
1 parent
ae20422754
commit
6904068251
4 files changed
+14
-40
No files matched your search
+1
-5
@@ -15,7 +15,6 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/google/puffs/lang/ast"
|
||||
"github.com/google/puffs/lang/check"
|
||||
"github.com/google/puffs/lang/parse"
|
||||
"github.com/google/puffs/lang/render"
|
||||
"github.com/google/puffs/lang/token"
|
||||
@@ -94,9 +93,6 @@ func genDir(puffsRoot string, dirname string, filenames []string, langs []string
|
||||
return err
|
||||
}
|
||||
}
|
||||
if _, err := check.Check(tm, 0, files...); err != nil {
|
||||
return err
|
||||
}
|
||||
combinedSrc := buf.Bytes()
|
||||
|
||||
packageName := path.Base(dirname)
|
||||
@@ -107,7 +103,7 @@ func genDir(puffsRoot string, dirname string, filenames []string, langs []string
|
||||
for _, lang := range langs {
|
||||
command := "puffs-gen-" + lang
|
||||
stdout := &bytes.Buffer{}
|
||||
cmd := exec.Command(command, "-assume_already_checked", "-package_name", packageName)
|
||||
cmd := exec.Command(command, "-package_name", packageName)
|
||||
cmd.Stdin = bytes.NewReader(combinedSrc)
|
||||
cmd.Stdout = stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
+10
-23
@@ -11,12 +11,6 @@ import (
|
||||
t "github.com/google/puffs/lang/token"
|
||||
)
|
||||
|
||||
type Flags uint32
|
||||
|
||||
const (
|
||||
FlagsOnlyTypeCheck = Flags(0x0001)
|
||||
)
|
||||
|
||||
type Error struct {
|
||||
Err error
|
||||
Filename string
|
||||
@@ -83,7 +77,7 @@ type Struct struct {
|
||||
Struct *a.Struct
|
||||
}
|
||||
|
||||
func Check(tm *t.Map, flags Flags, files ...*a.File) (*Checker, error) {
|
||||
func Check(tm *t.Map, files ...*a.File) (*Checker, error) {
|
||||
for _, f := range files {
|
||||
if f == nil {
|
||||
return nil, errors.New("check: Check given a nil *ast.File")
|
||||
@@ -107,7 +101,6 @@ func Check(tm *t.Map, flags Flags, files ...*a.File) (*Checker, error) {
|
||||
}
|
||||
}
|
||||
c := &Checker{
|
||||
flags: flags,
|
||||
tm: tm,
|
||||
reasonMap: rMap,
|
||||
funcs: map[t.QID]Func{},
|
||||
@@ -153,7 +146,6 @@ var phases = [...]struct {
|
||||
}
|
||||
|
||||
type Checker struct {
|
||||
flags Flags
|
||||
tm *t.Map
|
||||
reasonMap reasonMap
|
||||
|
||||
@@ -269,10 +261,8 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if c.flags&FlagsOnlyTypeCheck == 0 {
|
||||
if err := bcheckField(c.tm, f); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := bcheckField(c.tm, f); err != nil {
|
||||
return err
|
||||
}
|
||||
fieldNames[f.Name()] = true
|
||||
f.Node().SetTypeChecked()
|
||||
@@ -391,16 +381,13 @@ func (c *Checker) checkFuncBody(node *a.Node) error {
|
||||
}
|
||||
}
|
||||
|
||||
// Run bounds checks.
|
||||
if c.flags&FlagsOnlyTypeCheck == 0 {
|
||||
if err := q.bcheckBlock(n.Body()); err != nil {
|
||||
return &Error{
|
||||
Err: err,
|
||||
Filename: q.errFilename,
|
||||
Line: q.errLine,
|
||||
TMap: c.tm,
|
||||
Facts: q.facts,
|
||||
}
|
||||
if err := q.bcheckBlock(n.Body()); err != nil {
|
||||
return &Error{
|
||||
Err: err,
|
||||
Filename: q.errFilename,
|
||||
Line: q.errLine,
|
||||
TMap: c.tm,
|
||||
Facts: q.facts,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ func TestCheck(t *testing.T) {
|
||||
t.Fatalf("compareToPuffsfmt: %v", err)
|
||||
}
|
||||
|
||||
c, err := Check(tm, 0, file)
|
||||
c, err := Check(tm, file)
|
||||
if err != nil {
|
||||
t.Fatalf("Check: %v", err)
|
||||
}
|
||||
@@ -194,7 +194,7 @@ func TestConstValues(t *testing.T) {
|
||||
continue
|
||||
}
|
||||
|
||||
c, err := Check(tm, 0, file)
|
||||
c, err := Check(tm, file)
|
||||
if err != nil {
|
||||
t.Errorf("%q: Check: %v", s, err)
|
||||
continue
|
||||
|
||||
@@ -16,9 +16,6 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
assumeAlreadyChecked = flag.Bool("assume_already_checked", false,
|
||||
"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")
|
||||
)
|
||||
|
||||
@@ -41,13 +38,7 @@ func main1(g Generator) error {
|
||||
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(tm, checkFlags, files...); err != nil {
|
||||
if _, err := check.Check(tm, files...); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user