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

[pidgeot at users.sourceforge.net]

Revision: 50696
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50696&view=rev
Author:   pidgeot
Date:     2010-07-05 17:40:32 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Change CFG detection methods to be private

Modified Paths:
--------------
    tools/branches/gsoc2010-decompiler/decompiler/control_flow.h

Modified: tools/branches/gsoc2010-decompiler/decompiler/control_flow.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/control_flow.h	2010-07-05 16:29:29 UTC (rev 50695)
+++ tools/branches/gsoc2010-decompiler/decompiler/control_flow.h	2010-07-05 17:40:32 UTC (rev 50696)
@@ -73,40 +73,12 @@
 	 */
 	void setStackLevel(GraphVertex g, int level);
 
-public:
 	/**
-	 * Gets the current control flow graph.
-	 *
-	 * @returns The current control flow graph.
-	 */
-	const Graph &getGraph() const { return _g; };
-
-	/**
-	 * Constructor for the control flow graph.
-	 *
-	 * @param insts  std::vector containing the instructions to analyze control flow for.
-	 * @param engine Pointer to the Engine used for the script.
-	 */
-	ControlFlow(std::vector<Instruction> &insts, Engine *engine);
-
-	/**
-	 * Creates groups suitable for a stack-based machine.
-	 */
-	void createGroups();
-
-	/**
 	 * Merged groups that are part of the same short-circuited condition check.
 	 */
 	void detectShortCircuit();
 
 	/**
-	 * Performs control flow analysis.
-	 *
-	 * @returns The control flow graph after analysis.
-	 */
-	const Graph &analyze();
-
-	/**
 	 * Detects while blocks.
 	 */
 	void detectWhile();
@@ -139,6 +111,34 @@
 	 * Detects if and else blocks.
 	 */
 	void detectIf();
+
+public:
+	/**
+	 * Gets the current control flow graph.
+	 *
+	 * @returns The current control flow graph.
+	 */
+	const Graph &getGraph() const { return _g; };
+
+	/**
+	 * Constructor for the control flow graph.
+	 *
+	 * @param insts  std::vector containing the instructions to analyze control flow for.
+	 * @param engine Pointer to the Engine used for the script.
+	 */
+	ControlFlow(std::vector<Instruction> &insts, Engine *engine);
+
+	/**
+	 * Creates groups suitable for a stack-based machine.
+	 */
+	void createGroups();
+
+	/**
+	 * Performs control flow analysis.
+	 *
+	 * @returns The control flow graph after analysis.
+	 */
+	const Graph &analyze();
 };
 
 #endif


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