From bf138730334bef7289dee894fe22ce671c143f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Verhaeghe?= Date: Thu, 4 May 2023 10:31:26 +0200 Subject: [PATCH 1/2] use API of last FAST-Java until deciding where generateFastAndBind will go --- .../FamixJavaInterface.extension.st | 2 +- src/Carrefour-FastAndBindingGenerator/FamixTClass.extension.st | 2 +- src/Carrefour-FastAndBindingGenerator/FamixTMethod.extension.st | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st b/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st index 4ec4daf..66a4054 100644 --- a/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st +++ b/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st @@ -9,7 +9,7 @@ FamixJavaInterface >> bindFastModel: fastModel usingBinder: binder [ FamixJavaInterface >> generateFastAndBind [ | fastModel | self assert: self sourceAnchor isNotNil. - fastModel := self generateFastJava + fastModel := self getFASTModel metamodel: CRFModel metamodel; yourself. self bindFastModel: fastModel usingBinder: CRFBinderVisitor new. diff --git a/src/Carrefour-FastAndBindingGenerator/FamixTClass.extension.st b/src/Carrefour-FastAndBindingGenerator/FamixTClass.extension.st index 8b90118..548c1d5 100644 --- a/src/Carrefour-FastAndBindingGenerator/FamixTClass.extension.st +++ b/src/Carrefour-FastAndBindingGenerator/FamixTClass.extension.st @@ -9,7 +9,7 @@ FamixTClass >> bindFastModel: fastModel usingBinder: binder [ FamixTClass >> generateFastAndBind [ | fastModel | self assert: self sourceAnchor isNotNil. - fastModel := self generateFastJava + fastModel := self getFASTModel metamodel: CRFModel metamodel; yourself. self bindFastModel: fastModel usingBinder: CRFBinderVisitor new. diff --git a/src/Carrefour-FastAndBindingGenerator/FamixTMethod.extension.st b/src/Carrefour-FastAndBindingGenerator/FamixTMethod.extension.st index 0478e80..1ad1f84 100644 --- a/src/Carrefour-FastAndBindingGenerator/FamixTMethod.extension.st +++ b/src/Carrefour-FastAndBindingGenerator/FamixTMethod.extension.st @@ -9,7 +9,7 @@ FamixTMethod >> bindFastModel: fastModel usingBinder: binder [ FamixTMethod >> generateFastAndBind [ | fastModel | self assert: self sourceAnchor isNotNil. - fastModel := self generateFastJava + fastModel := self getFASTModel metamodel: CRFModel metamodel; yourself. self bindFastModel: fastModel usingBinder: CRFBinderVisitor new. From 78c0e440d36acfad94df5069e298bbec955864fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Verhaeghe?= Date: Thu, 4 May 2023 10:31:38 +0200 Subject: [PATCH 2/2] re --- .../FamixJavaInterface.extension.st | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st b/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st index 66a4054..59f02ba 100644 --- a/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st +++ b/src/Carrefour-FastAndBindingGenerator/FamixJavaInterface.extension.st @@ -32,8 +32,3 @@ FamixJavaInterface >> generateFastIfNotDoneAndBind [ (c isKindOf: FamixJavaClass) and: [ c isAnonymousClass not ] ]) asOrderedCollection \ { self }) anyOne generateFastAndBind ] ] - -{ #category : #'*Carrefour-FastAndBindingGenerator' } -FamixJavaInterface >> generateFastJava [ - ^ JavaSmaCCProgramNodeImporterVisitor new parseCodeString: self sourceAnchor sourceText -]