Read STON fields separator from file

hernanmd · Feb 22, 2022 · d1ec8ac · d1ec8ac
1 parent 112f1b9
commit d1ec8ac
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 57 deletions.
diff --git a/smalltalksrc/Melchor/CCodeGeneratorGlobalStructure.class.st b/smalltalksrc/Melchor/CCodeGeneratorGlobalStructure.class.st
@@ -200,7 +200,7 @@ CCodeGeneratorGlobalStructure >> generateCASTSetFieldTo: aTSendNode [
 
 		comparison := TSendNode 
 			receiver: (TConstantNode value: slot name asString) 
-			selector: '=' 
+			selector: 'strcmp:' 
 			arguments: { fieldName }.
 
 		TSendNode 

diff --git a/smalltalksrc/VMMaker/AbstractComposedImageAccess.class.st b/smalltalksrc/VMMaker/AbstractComposedImageAccess.class.st
@@ -16,14 +16,6 @@ AbstractComposedImageAccess class >> declareCVarsIn: aCCodeGenerator [
 
 ]
 
-{ #category : #'archive operations' }
-AbstractComposedImageAccess >> contentsOf: valueHolder [
-
-	<cmacro: '(value) value'>
-
-	^ valueHolder contents
-]
-
 { #category : #'file operations' }
 AbstractComposedImageAccess >> createImageDirectory: imageFileName [
 
@@ -54,39 +46,6 @@ AbstractComposedImageAccess >> existSegment: segmentIndex inImage: imageFileName
 		  inSmalltalk: [ fileName asFileReference exists ]
 ]
 
-{ #category : #'file primitives' }
-AbstractComposedImageAccess >> fprintf: aStream _: format [ 
-
-	<doNotGenerate>
-	^ self fprintf: aStream format: format arguments: { }
-]
-
-{ #category : #'file primitives' }
-AbstractComposedImageAccess >> fprintf: aStream _: format _: aValue [ 
-
-	<doNotGenerate>
-	^ self fprintf: aStream format: format arguments: { aValue }
-]
-
-{ #category : #'file primitives' }
-AbstractComposedImageAccess >> fprintf: aStream _: format _: aValue _: otherValue [
-
-	<doNotGenerate>
-	^ self fprintf: aStream format: format arguments: { aValue. otherValue }
-]
-
-{ #category : #'file primitives' }
-AbstractComposedImageAccess >> fprintf: aStream format: aFormat arguments: arguments [
-
-	<doNotGenerate>
-	| printf |
-	printf := PrintfFormatString new setFormat: aFormat.
-
-	aStream nextPutAll: (printf
-			 printf: arguments;
-			 string)
-]
-
 { #category : #'file primitives' }
 AbstractComposedImageAccess >> fscanf: file _: format _: varHolder [
 
@@ -103,11 +62,14 @@ AbstractComposedImageAccess >> fscanf: file _: format _: varHolder1 _: varHolder
 	<doNotGenerate>
 	^ (format = fieldFormat)
 		  ifTrue: [ 
-			  | dataArray |
-			  dataArray := file nextLine substrings: '#:,'.
-			  (dataArray first = '}') ifTrue: [ ^false ].
-			  varHolder1 contents: dataArray second trimLineSpaces.
-			  varHolder2 contents: dataArray third trimLineSpaces asInteger ];
+			  | line dataArray |
+			  line := file nextLine.
+			  dataArray := line substrings: '#:, '.
+			  dataArray first = '}' ifTrue: [ ^ false ].
+			  varHolder1 contents: dataArray second.
+			  varHolder2 contents: dataArray third asInteger.
+			  file position: file position - 1. "Not consume '\n' "
+			  (line last = $,) ifTrue: [ file position: file position - 1 ] "Not consume ',' " ];
 		  yourself
 ]
 

diff --git a/smalltalksrc/VMMaker/ComposedImageReader.class.st b/smalltalksrc/VMMaker/ComposedImageReader.class.st
@@ -4,6 +4,17 @@ Class {
 	#category : #'VMMaker-ImageFormat'
 }
 
+{ #category : #reading }
+ComposedImageReader >> endOfSTON: file [
+
+	"This method consume 2 chars from file and return they are equivalent to '\n}'"
+
+	| charLeft charRight |
+	charLeft := self fgetc: file.
+	charRight := self fgetc: file.
+	^ (charLeft = self endOfLine) and: [ charRight = $} ]
+]
+
 { #category : #reading }
 ComposedImageReader >> readFieldsSTONFrom: file into: aStruct [
 
@@ -15,16 +26,19 @@ ComposedImageReader >> readFieldsSTONFrom: file into: aStruct [
 		fieldName := ValueHolder new.
 		fieldValue := ValueHolder new ].
 
-	[ self
-		fscanf: file
-		_: fieldFormat
-		_: (self addressOf: fieldName)
-		_: (self addressOf: fieldValue) 
-		"check if line ends with ',\n' "
-	] whileTrue: [  
+	"This solution does NOT WORK with STON file without fields (empty STON)"
+
+	[ 
+		self
+			fscanf: file
+			_: fieldFormat
+			_: fieldName
+			_: (self addressOf: fieldValue).
+
 		aStruct setField: (self contentsOf: fieldName) to: (self contentsOf: fieldValue).
-	]
-
+
+		self endOfSTON: file
+	] whileFalse
 ]
 
 { #category : #reading }
@@ -35,7 +49,7 @@ ComposedImageReader >> readHeadSTONFrom: file into: aStruct [
 	| structName |
 	self simulationOnly: [ structName := ValueHolder new ].
 
-	self fscanf: file _: headFormat _: (self addressOf: structName).
+	self fscanf: file _: headFormat _: structName.
 
 	self simulationOnly: [ 
 		aStruct withStructNameDo: [ :name | 

diff --git a/smalltalksrc/VMMaker/VMClass.class.st b/smalltalksrc/VMMaker/VMClass.class.st
@@ -580,6 +580,14 @@ VMClass >> calloc: num _: size [
 	^ self malloc: num * size
 ]
 
+{ #category : #'translation support' }
+VMClass >> contentsOf: valueHolder [
+
+	<cmacro: '(value) value'>
+
+	^ valueHolder contents
+]
+
 { #category : #'translation support' }
 VMClass >> cppIf: conditionBlockOrValue ifTrue: trueExpressionOrBlock [
 	"When translated, produces #if (condition) #else #endif CPP directives.
@@ -601,6 +609,12 @@ VMClass >> defined: aSymbol [
 		ifNotNil: [:binding| binding value ~~ #undefined]
 ]
 
+{ #category : #'file primitives' }
+VMClass >> endOfLine [
+
+	^ self cCode: [ 13 ] inSmalltalk: [ Character cr ]
+]
+
 { #category : #'memory access' }
 VMClass >> fetchSingleFloatAtPointer: pointer into: aFloat [
 	"This gets implemented by Macros in C, where its types will also be checked.
@@ -610,6 +624,13 @@ VMClass >> fetchSingleFloatAtPointer: pointer into: aFloat [
 	^self fetchSingleFloatAt: pointer into: aFloat
 ]
 
+{ #category : #'file primitives' }
+VMClass >> fgetc: file [ 
+
+	<doNotGenerate>
+	^ file next
+]
+
 { #category : #'memory access' }
 VMClass >> floatAtPointer: pointer [
 	<doNotGenerate>
@@ -622,6 +643,39 @@ VMClass >> floatAtPointer: pointer put: value [
 	self halt.
 ]
 
+{ #category : #'file primitives' }
+VMClass >> fprintf: aStream _: format [ 
+
+	<doNotGenerate>
+	^ self fprintf: aStream format: format arguments: { }
+]
+
+{ #category : #'file primitives' }
+VMClass >> fprintf: aStream _: format _: aValue [ 
+
+	<doNotGenerate>
+	^ self fprintf: aStream format: format arguments: { aValue }
+]
+
+{ #category : #'file primitives' }
+VMClass >> fprintf: aStream _: format _: aValue _: otherValue [
+
+	<doNotGenerate>
+	^ self fprintf: aStream format: format arguments: { aValue. otherValue }
+]
+
+{ #category : #'file primitives' }
+VMClass >> fprintf: aStream format: aFormat arguments: arguments [
+
+	<doNotGenerate>
+	| printf |
+	printf := PrintfFormatString new setFormat: aFormat.
+
+	aStream nextPutAll: (printf
+			 printf: arguments;
+			 string)
+]
+
 { #category : #'C library simulation' }
 VMClass >> free: pointer [
 	<doNotGenerate>