throw error with conflicting API methods

PalumboN · Jun 29, 2023 · 7c28f4e · 7c28f4e
1 parent a830705
commit 7c28f4e
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 1 deletion.
diff --git a/smalltalksrc/Slang-Tests/SlangBasicTranslationTest.class.st b/smalltalksrc/Slang-Tests/SlangBasicTranslationTest.class.st
@@ -105,6 +105,16 @@ SlangBasicTranslationTest >> shouldGenerateDeadCode [
 	^ true
 ]
 
+{ #category : #'tests-method' }
+SlangBasicTranslationTest >> testApiMethodsWithConflictingName [
+
+	generator addClass: SlangConflictingApiTestClass.
+
+	self should: [generator renameConflictingMethods] raise: TranslationError.
+
+
+]
+
 { #category : #'tests-blocks' }
 SlangBasicTranslationTest >> testAssignBlockValueValueValue [
 

diff --git a/smalltalksrc/Slang-Tests/SlangConflictingApiTestClass.class.st b/smalltalksrc/Slang-Tests/SlangConflictingApiTestClass.class.st
@@ -0,0 +1,37 @@
+Class {
+	#name : #SlangConflictingApiTestClass,
+	#superclass : #SlangClass,
+	#category : #'Slang-Tests'
+}
+
+{ #category : #accessing }
+SlangConflictingApiTestClass class >> initializationOptions [
+
+	^ nil
+]
+
+{ #category : #accessing }
+SlangConflictingApiTestClass class >> interpreterClass [
+
+	^ nil
+]
+
+{ #category : #accessing }
+SlangConflictingApiTestClass class >> objectMemoryClass [
+
+	^ nil
+]
+
+{ #category : #accessing }
+SlangConflictingApiTestClass >> main [
+
+	<api>
+
+]
+
+{ #category : #accessing }
+SlangConflictingApiTestClass >> main: arg1 [
+
+	<api>
+
+]
diff --git a/smalltalksrc/Slang/CCodeGenerator.class.st b/smalltalksrc/Slang/CCodeGenerator.class.st
@@ -4433,6 +4433,11 @@ CCodeGenerator >> renameConflictingMethods [
 	toRename := cFunctionNames select: [ :conflicts | conflicts size > 1 ].
 
 	toRename keysDo: [ :key |
+		|conflictingMethods|
+		conflictingMethods := toRename at: key.
+		
+		((conflictingMethods select: [:m | m isAPIMethod ]) size > 1 ) ifTrue: [TranslationError signal: 'Conflicting API methods with name "', key, '"' ].
+		
 		(toRename at: key) do: [ :method |
 			method isStructAccessor ifFalse: [
 				self

diff --git a/smalltalksrc/Slang/TMethod.class.st b/smalltalksrc/Slang/TMethod.class.st
@@ -3300,7 +3300,7 @@ TMethod >> validateVariableDeclarationExists: aVariableName [
 
 	| shouldCheckVariable |
 	shouldCheckVariable := (aVariableName beginsWithAnyOf:
-		                       #( #self #cascade #toDoLimit )) not.
+		                       #( #self #cascade #toDoLimit #std )) not.
 
 	(shouldCheckVariable and: [
 		 (self declaresVariableWithName: aVariableName) not]) ifTrue: [