--- a/InstrumentingCompiler.st	Tue Apr 27 14:53:46 2010 +0200
+++ b/InstrumentingCompiler.st	Tue Apr 27 14:54:19 2010 +0200
@@ -14,6 +14,13 @@
 	privateIn:InstrumentingCompiler
 !
 
+InstrumentingCompiler::InstrumentationInfo subclass:#BlockExecutionInfo
+	instanceVariableNames:'characterPosition count'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:InstrumentingCompiler
+!
+
 InstrumentingCompiler::InstrumentationInfo subclass:#MethodInvocationInfo
 	instanceVariableNames:'infoPerReceiverClass'
 	classVariableNames:''
@@ -35,20 +42,6 @@
 	privateIn:InstrumentingCompiler::MethodInvocationInfo::MethodInvocationInfoPerReceiverClass
 !
 
-InstrumentingCompiler::InstrumentationInfo subclass:#BlockExecutionInfo
-	instanceVariableNames:'characterPosition count'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:InstrumentingCompiler
-!
-
-InstrumentingCompiler::MethodInvocationInfo subclass:#FullCallChainMethodInvocationInfo
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:InstrumentingCompiler
-!
-
 !InstrumentingCompiler class methodsFor:'documentation'!
 
 documentation
@@ -275,6 +268,54 @@
     "Created: / 27-04-2010 / 12:06:48 / cg"
 ! !
 
+!InstrumentingCompiler::BlockExecutionInfo methodsFor:'accessing'!
+
+callCount
+    ^ count
+
+    "Created: / 27-04-2010 / 13:45:15 / cg"
+!
+
+characterPosition
+    ^ characterPosition
+
+    "Created: / 23-06-2006 / 13:31:19 / cg"
+!
+
+characterPosition:something
+    characterPosition := something.
+
+    "Created: / 23-06-2006 / 13:31:19 / cg"
+!
+
+count
+    ^ count
+
+    "Created: / 23-06-2006 / 13:31:28 / cg"
+! !
+
+!InstrumentingCompiler::BlockExecutionInfo methodsFor:'cleanup'!
+
+cleanInfo
+    count := 0
+! !
+
+!InstrumentingCompiler::BlockExecutionInfo methodsFor:'instrumentation calls'!
+
+entry:callingContext
+    "probe entry from instrumented code;
+     called whenever the block is entered"
+
+"/ self halt.
+    count := count + 1.
+    count == 1 ifTrue:[
+        owningMethod changed:#methodInfo
+    ].
+
+    "Created: / 23-06-2006 / 13:31:16 / cg"
+    "Modified: / 27-04-2010 / 14:03:29 / cg"
+! !
+
 !InstrumentingCompiler::MethodInvocationInfo methodsFor:'accessing'!
 
 callingMethodsDo:aBlock
@@ -465,56 +506,8 @@
     countPerSendersClass at:sendersClass put:(count + 1)
 ! !
 
-!InstrumentingCompiler::BlockExecutionInfo methodsFor:'accessing'!
-
-callCount
-    ^ count
-
-    "Created: / 27-04-2010 / 13:45:15 / cg"
-!
-
-characterPosition
-    ^ characterPosition
-
-    "Created: / 23-06-2006 / 13:31:19 / cg"
-!
-
-characterPosition:something
-    characterPosition := something.
-
-    "Created: / 23-06-2006 / 13:31:19 / cg"
-!
-
-count
-    ^ count
-
-    "Created: / 23-06-2006 / 13:31:28 / cg"
-! !
-
-!InstrumentingCompiler::BlockExecutionInfo methodsFor:'cleanup'!
-
-cleanInfo
-    count := 0
-! !
-
-!InstrumentingCompiler::BlockExecutionInfo methodsFor:'instrumentation calls'!
-
-entry:callingContext
-    "probe entry from instrumented code;
-     called whenever the block is entered"
-
-"/ self halt.
-    count := count + 1.
-    count == 1 ifTrue:[
-        owningMethod changed:#methodInfo
-    ].
-
-    "Created: / 23-06-2006 / 13:31:16 / cg"
-    "Modified: / 27-04-2010 / 14:03:29 / cg"
-! !
-
 !InstrumentingCompiler class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentingCompiler.st,v 1.1 2010-04-27 12:53:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentingCompiler.st,v 1.2 2010-04-27 12:54:19 cg Exp $'
 ! !