clean

smalltalksrc/Slang-Tests/SlangBasicTranslationTest.class.st

@@ -1804,17 +1804,17 @@ methodWithoutReturn(void)
 SlangBasicTranslationTest >> testMethodsWithConflictingName [
 
 	| translation1 translation2 tMethod1 tMethod2 |
-	
 	tMethod1 := self getTMethodFrom: #methodWithRepeatedCFunctionName.
 	tMethod2 := generator methods at: #methodWithRepeatedCFunctionName:.
 
 	generator renameConflictingMethods.
 
 	translation1 := self translate: tMethod1.
 	translation2 := self translate: tMethod2.
-	
-	self assert: (self functionIdentifier: translation1)
-		~= (self functionIdentifier: translation2)
+
+	self
+		deny: (self functionIdentifier: translation1)
+		equals: (self functionIdentifier: translation2)
 ]
 
 { #category : #'tests-case' }
@@ -6607,9 +6607,7 @@ SlangBasicTranslationTest >> testVariableWithConflictingNameShouldBeRenamed [
 	translation := self translate: method.
 
 
-	self
-		assert: (translation lineNumber: 5)
-		equals: '	char *l_methodWithoutReturn;'
+	self assert: (translation includesSubstring: 'char *l_methodWithoutReturn').
 ]
 
 { #category : #'tests-variables' }

smalltalksrc/Slang/CCodeGenerator.class.st

@@ -4445,7 +4445,7 @@ CCodeGenerator >> renameConflictingMethods [
 	| cFunctionNames toRename |
 	cFunctionNames := IdentityDictionary new.
 
-	methods do: [ :m |
+	methods reject: [ :m | m isStructAccessor ] thenDo: [ :m |
 		| functionName conflicts |
 		functionName := self cFunctionNameFor: m selector.
 
@@ -4455,22 +4455,15 @@ CCodeGenerator >> renameConflictingMethods [
 
 	toRename := cFunctionNames select: [ :conflicts | conflicts size > 1 ].
 
-	toRename keysDo: [ :key |
-		| conflictingMethods |
-		conflictingMethods := toRename at: key.
-
-		"api methods cannot be renamed"
-		(conflictingMethods select: [ :m | m isAPIMethod ]) size > 1
-			ifTrue: [
+	toRename keysAndValuesDo: [ :key :conflictingMethods |
+		conflictingMethods do: [ :method |
+			method isAPIMethod ifTrue: [ "api methods cannot be renamed"
 				TranslationError signal:
 					'Conflicting API methods would be translated to "' , key , '"' ].
 
-
-		(conflictingMethods reject: [ :m | m isAPIMethod ]) do: [ :method |
-			method isStructAccessor ifFalse: [
-				self
-					addSelectorTranslation: method selector
-					to: key , method args size asString ] ] ]
+			self
+				addSelectorTranslation: method selector
+				to: key , method args size asString ] ]
 ]
 
 { #category : #renaming }