Fixes refactoring inssues and typenames in visitors

Issue: #32
0x7CFE · Mar 23, 2014 · 94ec2f2 · 94ec2f2
1 parent 5d23c86
commit 94ec2f2
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/include/instructions.h b/include/instructions.h
@@ -195,8 +195,6 @@ class ParsedMethod : public ParsedBytecode {
         parse();
     }
 
-    TMethod* getOrigin() const { return m_origin; }
-
 protected:
     virtual void parseBlock(uint16_t startOffset, uint16_t stopOffset);
 
@@ -212,7 +210,8 @@ class ParsedMethod : public ParsedBytecode {
 class ParsedBlock : public ParsedBytecode {
 public:
     ParsedBlock(ParsedMethod* parsedMethod, uint16_t startOffset, uint16_t stopOffset)
-        : ParsedBytecode(parsedMethod->getOrigin()), m_startOffset(startOffset), m_stopOffset(stopOffset)
+        : ParsedBytecode(parsedMethod->getOrigin()), m_containerMethod(parsedMethod),
+          m_startOffset(startOffset), m_stopOffset(stopOffset)
     {
         parse(startOffset, stopOffset);
     }
@@ -237,14 +236,14 @@ class ParsedBlock : public ParsedBytecode {
 
 class BasicBlockVisitor {
 public:
-    BasicBlockVisitor(ParsedMethod* parsedMethod) : m_parsedMethod(parsedMethod) { }
+    BasicBlockVisitor(ParsedBytecode* parsedBytecode) : m_parsedBytecode(parsedBytecode) { }
     virtual ~BasicBlockVisitor() { }
 
     virtual bool visitBlock(BasicBlock& basicBlock) { return true; }
 
     void run() {
-        ParsedMethod::iterator iBlock = m_parsedMethod->begin();
-        const ParsedMethod::iterator iEnd = m_parsedMethod->end();
+        ParsedBytecode::iterator iBlock = m_parsedBytecode->begin();
+        const ParsedBytecode::iterator iEnd = m_parsedBytecode->end();
 
         while (iBlock != iEnd) {
             if (! visitBlock(** iBlock))
@@ -255,12 +254,12 @@ class BasicBlockVisitor {
     }
 
 private:
-    ParsedMethod* m_parsedMethod;
+    ParsedBytecode* m_parsedBytecode;
 };
 
 class InstructionVisitor : public BasicBlockVisitor {
 public:
-    InstructionVisitor(ParsedMethod* parsedMethod) : BasicBlockVisitor(parsedMethod) { }
+    InstructionVisitor(ParsedBytecode* parsedBytecode) : BasicBlockVisitor(parsedBytecode) { }
     virtual bool visitInstruction(const TSmalltalkInstruction& instruction) { return true; }
 
 protected: