Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove extra operator FOR. Fixes #529 #530

Merged
merged 1 commit into from Jan 3, 2018
Merged

Remove extra operator FOR. Fixes #529 #530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions transpiler/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,11 @@ func transpileIfStmt(n *ast.IfStmt, p *program.Program) (
}

func transpileForStmt(n *ast.ForStmt, p *program.Program) (
f *goast.ForStmt, preStmts []goast.Stmt, postStmts []goast.Stmt, err error) {
f goast.Stmt, preStmts []goast.Stmt, postStmts []goast.Stmt, err error) {

// This `defer` is workaround
// Please remove after solving all problems
defer func() {
if f == (*goast.ForStmt)(nil) {
p.AddMessage(p.GenerateWarningMessage(fmt.Errorf("ForStmt cannot be nil"), n))
f = &goast.ForStmt{ // This is workaround
Body: &goast.BlockStmt{
Lbrace: 1,
List: []goast.Stmt{&goast.BranchStmt{Tok: token.BREAK}},
},
}
}
if err != nil {
err = fmt.Errorf("Cannot tranpile ForStmt: err = %v", err)
p.AddMessage(p.GenerateWarningMessage(err, n))
Expand Down Expand Up @@ -345,15 +336,7 @@ func transpileForStmt(n *ast.ForStmt, p *program.Program) (
block.List = combineStmts(&forStmt, preStmts, postStmts)
block.Lbrace = 1

return &goast.ForStmt{ // This is workaround
Body: &goast.BlockStmt{
Lbrace: 1,
List: []goast.Stmt{&goast.BranchStmt{Tok: token.BREAK}},
},
},
nil,
[]goast.Stmt{&block},
nil
return &block, nil, nil, nil
}

// transpileWhileStmt - transpiler for operator While.
Expand Down Expand Up @@ -412,7 +395,7 @@ func transpileForStmt(n *ast.ForStmt, p *program.Program) (
// | `-UnaryOperator 0x2530ca0 <line:13:3, col:4> 'int' postfix '--'
// | `-DeclRefExpr 0x2530c78 <col:3> 'int' lvalue Var 0x25306f8 'i' 'int'
func transpileWhileStmt(n *ast.WhileStmt, p *program.Program) (
*goast.ForStmt, []goast.Stmt, []goast.Stmt, error) {
goast.Stmt, []goast.Stmt, []goast.Stmt, error) {
var forOperator ast.ForStmt
forOperator.AddChild(nil)
forOperator.AddChild(nil)
Expand Down Expand Up @@ -494,7 +477,7 @@ func transpileWhileStmt(n *ast.WhileStmt, p *program.Program) (
// | | `-BreakStmt 0x3bb1d80 <line:16:4>
// | `-<<<NULL>>>
func transpileDoStmt(n *ast.DoStmt, p *program.Program) (
*goast.ForStmt, []goast.Stmt, []goast.Stmt, error) {
goast.Stmt, []goast.Stmt, []goast.Stmt, error) {
var forOperator ast.ForStmt
forOperator.AddChild(nil)
forOperator.AddChild(nil)
Expand Down