[Scummvm-cvs-logs] SF.net SVN: scummvm:[52033] tools/branches/gsoc2010-decompiler/decompiler
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Aug 12 13:24:28 CEST 2010
Revision: 52033
http://scummvm.svn.sourceforge.net/scummvm/?rev=52033&view=rev
Author: fingolfin
Date: 2010-08-12 11:24:28 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
DECOMPILER: Get rid of some now superfluous ::
Modified Paths:
--------------
tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.h
tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h
tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp
tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h
tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h
tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp
tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h
tools/branches/gsoc2010-decompiler/decompiler/simple_disassembler.cpp
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -231,7 +231,7 @@
}
break;
default:
- ::CodeGenerator::processSpecialMetadata(inst, c);
+ CodeGenerator::processSpecialMetadata(inst, c);
break;
}
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.h 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/codegen.h 2010-08-12 11:24:28 UTC (rev 52033)
@@ -30,7 +30,7 @@
/**
* KYRA code generator.
*/
-class Kyra2CodeGenerator : public ::CodeGenerator {
+class Kyra2CodeGenerator : public CodeGenerator {
private:
int _stackOffset; ///< Running count of where in the stack to look for the next argument.
@@ -58,7 +58,7 @@
* @param engine Pointer to the Engine used for the script.
* @param output The std::ostream to output the code to.
*/
- Kyra2CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kLIFO, kLIFO) {}
+ Kyra2CodeGenerator(Engine *engine, std::ostream &output) : CodeGenerator(engine, output, kLIFO, kLIFO) {}
protected:
void processInst(const Instruction inst);
virtual void processSpecialMetadata(const Instruction inst, char c);
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -264,7 +264,7 @@
_data = NULL;
}
-Kyra::Kyra2Disassembler::Kyra2Disassembler(Kyra2Engine *engine, std::vector<Instruction> &insts) : ::Disassembler(insts), _engine(engine) {
+Kyra::Kyra2Disassembler::Kyra2Disassembler(Kyra2Engine *engine, std::vector<Instruction> &insts) : Disassembler(insts), _engine(engine) {
setupKyra2Funcs();
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/disassembler.h 2010-08-12 11:24:28 UTC (rev 52033)
@@ -72,7 +72,7 @@
/**
* Disassembler for KYRA.
*/
-class Kyra2Disassembler : public ::Disassembler {
+class Kyra2Disassembler : public Disassembler {
private:
IFF_ID _formType; ///< File type as listed in the IFF formatted file.
IFFChunk _textChunk; ///< Contents of the TEXT chunk.
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -28,7 +28,7 @@
#include <sstream>
#include <boost/format.hpp>
-::Disassembler *Kyra::Kyra2Engine::getDisassembler(std::vector<Instruction> &insts) {
+Disassembler *Kyra::Kyra2Engine::getDisassembler(std::vector<Instruction> &insts) {
return new Kyra2Disassembler(this, insts);
}
@@ -36,7 +36,7 @@
return it->_params[0].getUnsigned();
}
-::CodeGenerator *Kyra::Kyra2Engine::getCodeGenerator(std::ostream &output) {
+CodeGenerator *Kyra::Kyra2Engine::getCodeGenerator(std::ostream &output) {
return new Kyra2CodeGenerator(this, output);
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/kyra/engine.h 2010-08-12 11:24:28 UTC (rev 52033)
@@ -33,11 +33,11 @@
/**
* KYRA engine.
*/
-class Kyra2Engine : public ::Engine {
+class Kyra2Engine : public Engine {
public:
- ::Disassembler *getDisassembler(std::vector<Instruction> &insts);
+ Disassembler *getDisassembler(std::vector<Instruction> &insts);
uint32 getDestAddress(ConstInstIterator it) const;
- ::CodeGenerator *getCodeGenerator(std::ostream &output);
+ CodeGenerator *getCodeGenerator(std::ostream &output);
void postCFG(std::vector<Instruction> &insts, Graph g);
bool detectMoreFuncs() const;
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -458,7 +458,7 @@
addArg(_stack.pop());
break;
default:
- ::CodeGenerator::processSpecialMetadata(inst, c);
+ CodeGenerator::processSpecialMetadata(inst, c);
break;
}
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/codegen.h 2010-08-12 11:24:28 UTC (rev 52033)
@@ -32,7 +32,7 @@
/**
* SCUMMv6 code generator.
*/
-class Scummv6CodeGenerator : public ::CodeGenerator {
+class Scummv6CodeGenerator : public CodeGenerator {
private:
/**
* Get the name associated with a variable ID.
@@ -71,7 +71,7 @@
* @param engine Pointer to the Engine used for the script.
* @param output The std::ostream to output the code to.
*/
- Scummv6CodeGenerator(Engine *engine, std::ostream &output) : ::CodeGenerator(engine, output, kFIFO, kFIFO) {}
+ Scummv6CodeGenerator(Engine *engine, std::ostream &output) : CodeGenerator(engine, output, kFIFO, kFIFO) {}
protected:
void processInst(const Instruction inst);
virtual void processSpecialMetadata(const Instruction inst, char c);
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -27,7 +27,7 @@
#include "disassembler.h"
-Scumm::v6::Scummv6Disassembler::Scummv6Disassembler(std::vector<Instruction> &insts) : ::SimpleDisassembler(insts) {
+Scumm::v6::Scummv6Disassembler::Scummv6Disassembler(std::vector<Instruction> &insts) : SimpleDisassembler(insts) {
}
void Scumm::v6::Scummv6Disassembler::doDisassemble() throw(std::exception) {
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -24,7 +24,7 @@
#include "disassembler.h"
#include "codegen.h"
-::Disassembler *Scumm::v6::Scummv6Engine::getDisassembler(std::vector<Instruction> &insts) {
+Disassembler *Scumm::v6::Scummv6Engine::getDisassembler(std::vector<Instruction> &insts) {
return new Scummv6Disassembler(insts);
}
@@ -41,6 +41,6 @@
}
}
-::CodeGenerator *Scumm::v6::Scummv6Engine::getCodeGenerator(std::ostream &output) {
+CodeGenerator *Scumm::v6::Scummv6Engine::getCodeGenerator(std::ostream &output) {
return new Scummv6CodeGenerator(this, output);
}
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/engine.h 2010-08-12 11:24:28 UTC (rev 52033)
@@ -32,11 +32,11 @@
/**
* SCUMMv6 engine.
*/
-class Scummv6Engine : public ::Engine {
+class Scummv6Engine : public Engine {
public:
- ::Disassembler *getDisassembler(std::vector<Instruction> &insts);
+ Disassembler *getDisassembler(std::vector<Instruction> &insts);
uint32 getDestAddress(ConstInstIterator it) const;
- ::CodeGenerator *getCodeGenerator(std::ostream &output);
+ CodeGenerator *getCodeGenerator(std::ostream &output);
};
} // End of namespace v6
Modified: tools/branches/gsoc2010-decompiler/decompiler/simple_disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/simple_disassembler.cpp 2010-08-12 11:23:32 UTC (rev 52032)
+++ tools/branches/gsoc2010-decompiler/decompiler/simple_disassembler.cpp 2010-08-12 11:24:28 UTC (rev 52033)
@@ -22,7 +22,7 @@
#include "simple_disassembler.h"
-SimpleDisassembler::SimpleDisassembler(std::vector<Instruction> &insts) : ::Disassembler(insts) {
+SimpleDisassembler::SimpleDisassembler(std::vector<Instruction> &insts) : Disassembler(insts) {
}
void SimpleDisassembler::readParams(Instruction *inst, char *typeString) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list