Fix var statements inside an else-if.

This commit is contained in:
Nigel Tao committed 2017-06-10 12:44:58 +10:00
1 parent 321ebf8617
commit 9d0558df5a
5 files changed
+64 -40

No files matched your search

+27 -16
View File
@@ -571,7 +571,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
g.writes("\n")
// Generate the local variables.
if err := g.writeVars(n.Node(), 0); err != nil {
if err := g.writeVars(n.Body(), 0); err != nil {
return err
}
g.writes("\n")
@@ -645,28 +645,39 @@ func (g *gen) writeField(n *a.Field, namePrefix string) error {
return nil
}
func (g *gen) writeVars(n *a.Node, depth uint32) error {
func (g *gen) writeVars(block []*a.Node, depth uint32) error {
if depth > a.MaxBodyDepth {
return fmt.Errorf("body recursion depth too large")
}
depth++
if n.Kind() == a.KVar {
x := n.Var().XType()
// TODO: use g.writeCTypeName.
if k := x.Name().Key(); k < t.Key(len(cTypeNames)) {
if s := cTypeNames[k]; s != "" {
g.printf("%s %s%s;\n", s, vPrefix, n.Var().Name().String(g.tm))
return nil
for _, o := range block {
switch o.Kind() {
case a.KIf:
for o := o.If(); o != nil; o = o.ElseIf() {
if err := g.writeVars(o.BodyIfTrue(), depth); err != nil {
return err
}
if err := g.writeVars(o.BodyIfFalse(), depth); err != nil {
return err
}
}
}
// TODO: fix this.
return fmt.Errorf("cannot convert Puffs type %q to C", x.String(g.tm))
}
for _, l := range n.Raw().SubLists() {
for _, o := range l {
if err := g.writeVars(o, depth); err != nil {
case a.KVar:
o := o.Var()
x := o.XType()
// TODO: use g.writeCTypeName.
if k := x.Name().Key(); k < t.Key(len(cTypeNames)) {
if s := cTypeNames[k]; s != "" {
g.printf("%s %s%s;\n", s, vPrefix, o.Name().String(g.tm))
continue
}
}
// TODO: fix this.
return fmt.Errorf("cannot convert Puffs type %q to C", x.String(g.tm))
case a.KWhile:
if err := g.writeVars(o.While().Body(), depth); err != nil {
return err
}
}
+3
View File
@@ -224,6 +224,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
uint32_t v_bits;
uint32_t v_n_bits;
uint32_t v_code;
uint32_t v_s;
v_clear_code = (((uint32_t)(1)) << self->f_literal_width);
v_end_code = (v_clear_code + 1);
@@ -267,6 +268,8 @@ label_0_continue:;
status = puffs_gif_status_ok;
goto cleanup0;
} else if (v_code <= v_save_code) {
v_s = 4095;
v_s = (0 * v_s);
} else {
status = puffs_gif_error_bad_gif_image;
goto cleanup0;
+5 -7
View File
@@ -343,13 +343,11 @@ func (c *Checker) checkFuncBody(node *a.Node) error {
// Fill in the TypeMap with all local variables. Note that they have
// function scope and can be hoisted, JavaScript style, a la
// https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Statements/var
for _, o := range n.Body() {
if err := q.tcheckVars(o); err != nil {
return &Error{
Err: err,
Filename: q.errFilename,
Line: q.errLine,
}
if err := q.tcheckVars(n.Body()); err != nil {
return &Error{
Err: err,
Filename: q.errFilename,
Line: q.errLine,
}
}
+27 -17
View File
@@ -11,24 +11,34 @@ import (
t "github.com/google/puffs/lang/token"
)
func (q *checker) tcheckVars(n *a.Node) error {
q.errFilename, q.errLine = n.Raw().FilenameLine()
func (q *checker) tcheckVars(block []*a.Node) error {
for _, o := range block {
q.errFilename, q.errLine = o.Raw().FilenameLine()
if n.Kind() == a.KVar {
n := n.Var()
name := n.Name()
if _, ok := q.f.LocalVars[name]; ok {
return fmt.Errorf("check: duplicate var %q", name.String(q.tm))
}
if err := q.tcheckTypeExpr(n.XType(), 0); err != nil {
return err
}
q.f.LocalVars[name] = n.XType()
return nil
}
for _, l := range n.Raw().SubLists() {
for _, o := range l {
if err := q.tcheckVars(o); err != nil {
switch o.Kind() {
case a.KIf:
for o := o.If(); o != nil; o = o.ElseIf() {
if err := q.tcheckVars(o.BodyIfTrue()); err != nil {
return err
}
if err := q.tcheckVars(o.BodyIfFalse()); err != nil {
return err
}
}
case a.KVar:
o := o.Var()
name := o.Name()
if _, ok := q.f.LocalVars[name]; ok {
return fmt.Errorf("check: duplicate var %q", name.String(q.tm))
}
if err := q.tcheckTypeExpr(o.XType(), 0); err != nil {
return err
}
q.f.LocalVars[name] = o.XType()
case a.KWhile:
if err := q.tcheckVars(o.While().Body()); err != nil {
return err
}
}
+2
View File
@@ -62,6 +62,8 @@ pub func lzw_decoder.decode?(dst ptr buf1, src ptr buf1, src_final bool)() {
return
} else if code <= save_code {
var s u32[..4095] = 4095
s = 0 * s
// TODO: implement.
} else {