[Scummvm-cvs-logs] SF.net SVN: scummvm:[51227] tools/branches/gsoc2010-decompiler/decompiler/ codegen.cpp

[pidgeot at users.sourceforge.net]

Revision: 51227
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51227&view=rev
Author:   pidgeot
Date:     2010-07-23 21:27:28 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
Don't end else block if merged with an if block

Currently, "else { if () {" is merged into a single "else if () {"
block. In those cases, we don't want to output the ending } for one of
those blocks, so we'll skip ending the else.

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp

Modified: tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp	2010-07-23 21:26:30 UTC (rev 51226)
+++ tools/branches/gsoc2010-decompiler/decompiler/codegen.cpp	2010-07-23 21:27:28 UTC (rev 51227)
@@ -267,7 +267,7 @@
 	} while (it++ != _curGroup->_end);
 
 	// Add else end if necessary
-	if (_curGroup->_endElse != NULL)
+	if (_curGroup->_endElse != NULL && (_curGroup->_endElse->_type != kIfCond || !_curGroup->_endElse->_startElse))
 		addOutputLine("}");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.