Fix class method loading when source file is used jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 25 May 2020 13:24:22 +0100
branchjv
changeset 1098 620da38786b6
parent 1095 87f223484bc3
child 1099 df7f9c846b88
Fix class method loading when source file is used ...as opposed to using binary-serialized MC definition.
MCStReader.st
--- a/MCStReader.st	Wed Nov 14 12:57:13 2018 +0100
+++ b/MCStReader.st	Mon May 25 13:24:22 2020 +0100
@@ -1,5 +1,7 @@
 "{ Package: 'stx:goodies/monticello' }"
 
+"{ NameSpace: Smalltalk }"
+
 MCSnapshotReader subclass:#MCStReader
 	instanceVariableNames:''
 	classVariableNames:''
@@ -180,6 +182,11 @@
     "Created: / 25-11-2011 / 17:24:08 / cg"
 !
 
+visitChange:aChange
+
+    "Created: / 25-05-2020 / 12:48:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 visitClassCommentChange:aChange
     definitions add:(MCClassComment new
                         className: aChange className
@@ -241,9 +248,17 @@
 !
 
 visitMethodChange:aChange
+    | className classIsMeta |
+
+    className := aChange className.
+    classIsMeta := aChange isForMeta.
+    classIsMeta ifTrue:[
+        "/ Strip ' class' suffix in name
+        className := className copyUpTo: Character space.
+    ].
     definitions add:(MCMethodDefinition
-                        className: aChange className
-                        classIsMeta: aChange isForMeta
+                        className: className
+                        classIsMeta: classIsMeta
                         selector: aChange changeSelector
                         category: aChange category "/ (aPseudoClass organization categoryOfElement: ea)
                         timeStamp: nil "aChange timeStamp" "/ (aPseudoClass stampAt: ea)
@@ -251,6 +266,7 @@
                     )
 
     "Created: / 25-11-2011 / 17:15:36 / cg"
+    "Modified: / 25-05-2020 / 13:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !MCStReader class methodsFor:'documentation'!
@@ -263,6 +279,11 @@
     ^ '$Header: /cvs/stx/stx/goodies/monticello/MCStReader.st,v 1.9 2014-12-23 19:48:43 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id: MCStReader.st,v 1.9 2014-12-23 19:48:43 cg Exp $'
 ! !