Same in FFI and Bootstrap

estebanlm · Sep 24, 2019 · 174b752 · 174b752
1 parent 6544404
commit 174b752
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/FFI-Kernel/ExternalStructure.class.st b/src/FFI-Kernel/ExternalStructure.class.st
@@ -367,7 +367,7 @@ ExternalStructure class >> obsolete [
 	NOTE: You if you remove the whole class category at once, you cannot
 	assume that the ExternalType class is still present."
 
-	Smalltalk at: #ExternalType ifPresent: [:class | class noticeRemovalOf: self].
+	self environment at: #ExternalType ifPresent: [:class | class noticeRemovalOf: self].
 	^ super obsolete
 ]
 

diff --git a/src/FFI-Kernel/ExternalType.class.st b/src/FFI-Kernel/ExternalType.class.st
@@ -211,7 +211,7 @@ ExternalType class >> initializeStructureTypes [
 	| referentClass pointerType |
 	self cleanupUnusedTypes.
 	StructTypes keysAndValuesDo:[:referentName :type|
-		referentClass := (Smalltalk at: referentName ifAbsent:[nil]).
+		referentClass := (self environment at: referentName ifAbsent:[nil]).
 		(referentClass isBehavior and:[
 			referentClass includesBehavior: ExternalStructure])
 				ifFalse:[referentClass := nil].
@@ -242,7 +242,7 @@ ExternalType class >> newTypeNamed: aString force: aBool [
 	sym := aString asSymbol.
 	type := StructTypes at: aString ifAbsent:[nil].
 	type == nil ifFalse:[^type].
-	referentClass := Smalltalk at: sym ifAbsent:[nil].
+	referentClass := self environment at: sym ifAbsent:[nil].
 	(referentClass isBehavior and:[referentClass includesBehavior: ExternalStructure])
 		ifFalse:[referentClass := nil].
 	"If we don't have a referent class and are not forced to create a type get out"

diff --git a/src/PharoBootstrap-Initialization/PharoBootstrapInitialization.class.st b/src/PharoBootstrap-Initialization/PharoBootstrapInitialization.class.st
@@ -92,12 +92,13 @@ PharoBootstrapInitialization class >> initializeCommandLineHandlerAndErrorHandli
 
 { #category : #'public api' }
 PharoBootstrapInitialization class >> initializeFileSystem [
-
-	(Smalltalk at: #FileLocator) initialize.
-	(Smalltalk at: #DiskStore) initialize.
-	(Smalltalk at: #FileHandle) initialize.
-	(Smalltalk at: #MultiByteFileStream) initialize.
-	(Smalltalk at: #File) initialize
+	| env |
+	env := self environment.
+	(env at: #FileLocator) initialize.
+	(env at: #DiskStore) initialize.
+	(env at: #FileHandle) initialize.
+	(env at: #MultiByteFileStream) initialize.
+	(env at: #File) initialize
 ]
 
 { #category : #'public api' }