Fix ValueHolder contents translation

hernanmd · Feb 21, 2022 · 8a352ee · 8a352ee
1 parent 7a0fded
commit 8a352ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/smalltalksrc/VMMaker/AbstractComposedImageAccess.class.st b/smalltalksrc/VMMaker/AbstractComposedImageAccess.class.st
@@ -16,6 +16,14 @@ AbstractComposedImageAccess class >> declareCVarsIn: aCCodeGenerator [
 
 ]
 
+{ #category : #'archive operations' }
+AbstractComposedImageAccess >> contentsOf: valueHolder [
+
+	<cmacro: '(value) value'>
+
+	^ valueHolder contents
+]
+
 { #category : #'file operations' }
 AbstractComposedImageAccess >> createImageDirectory: imageFileName [
 

diff --git a/smalltalksrc/VMMaker/ComposedImageReader.class.st b/smalltalksrc/VMMaker/ComposedImageReader.class.st
@@ -21,7 +21,7 @@ ComposedImageReader >> readFieldsSTONFrom: file into: aStruct [
 		_: (self addressOf: fieldName)
 		_: (self addressOf: fieldValue) 
 	] whileTrue: [  
-		aStruct setField: fieldName contents to: fieldValue contents.
+		aStruct setField: (self contentsOf: fieldName) to: (self contentsOf: fieldValue).
 	]
 
 ]
@@ -38,7 +38,7 @@ ComposedImageReader >> readHeadSTONFrom: file into: aStruct [
 
 	self simulationOnly: [ 
 		aStruct withStructNameDo: [ :name | 
-			self assert: name = structName contents ] ]
+			self assert: name = (self contentsOf: structName) ] ]
 ]
 
 { #category : #api }