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

[pidgeot at users.sourceforge.net]

Revision: 49515
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49515&view=rev
Author:   pidgeot
Date:     2010-06-08 20:21:08 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
Formatting fixes

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp
    tools/branches/gsoc2010-decompiler/decompiler/engine.h
    tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h
    tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h

Modified: tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp	2010-06-08 19:36:33 UTC (rev 49514)
+++ tools/branches/gsoc2010-decompiler/decompiler/disassembler.cpp	2010-06-08 20:21:08 UTC (rev 49515)
@@ -33,14 +33,14 @@
 }
 
 void Disassembler::dumpDisassembly(std::ostream &output) {
-	for (size_t i = 0; i < _insts.size(); i++) {
-		Instruction inst = _insts[i];
-		output << boost::format("%08x: %s ") % inst._address % inst._name;
-		for (size_t j = 0; j < inst._params.size(); j++) {
-			Parameter p = inst._params[j];
-			if (j != 0)
+	std::vector<Instruction>::iterator inst;
+	for (inst = _insts.begin(); inst != _insts.end(); ++inst) {
+		output << boost::format("%08x: %s ") % inst->_address % inst->_name;
+		std::vector<Parameter>::iterator param;
+		for (param = inst->_params.begin(); param != inst->_params.end(); ++param) {
+			if (param != inst->_params.begin())
 				output << ", ";
-			output << p._value;
+			output << param->_value;
 		}
 		output << "\n";
 	}

Modified: tools/branches/gsoc2010-decompiler/decompiler/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/engine.h	2010-06-08 19:36:33 UTC (rev 49514)
+++ tools/branches/gsoc2010-decompiler/decompiler/engine.h	2010-06-08 20:21:08 UTC (rev 49515)
@@ -27,7 +27,7 @@
 
 class Engine {
 public:
-	virtual Disassembler* getDisassembler() = 0;
+	virtual Disassembler *getDisassembler() = 0;
 };
 
 #endif

Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h	2010-06-08 19:36:33 UTC (rev 49514)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.h	2010-06-08 20:21:08 UTC (rev 49515)
@@ -26,17 +26,21 @@
 #include "decompiler/simple_disassembler.h"
 
 namespace Scumm {
-	namespace v6 {
-		/**
-		 * Disassembler for SCUMMv6.
-		 */
-		class Disassembler : public SimpleDisassembler {
-		public:
-			std::vector<Instruction> disassemble();
 
-			void readParameter(Parameter *p, char type);
-		};
-	}
-}
+namespace v6 {
 
+/**
+ * Disassembler for SCUMMv6.
+ */
+class Disassembler : public SimpleDisassembler {
+public:
+	std::vector<Instruction> disassemble();
+
+	void readParameter(Parameter *p, char type);
+};
+
+} //End of namespace Scumm::v6
+
+} //End of namespace Scumm
+
 #endif

Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h	2010-06-08 19:36:33 UTC (rev 49514)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h	2010-06-08 20:21:08 UTC (rev 49515)
@@ -26,12 +26,16 @@
 #include "../engine.h"
 
 namespace Scumm {
-	namespace v6 {
-		class Engine : public ::Engine {
-		public:
-			::Disassembler *getDisassembler();
-		};
-	}
-}
 
+namespace v6 {
+
+class Engine : public ::Engine {
+public:
+	::Disassembler *getDisassembler();
+};
+
+} //End of namespace Scumm::v6
+
+} //End of namespace Scumm
+
 #endif


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