Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9 tests are broken since famix parametric update #10

Closed
wants to merge 5 commits into from
Closed

9 tests are broken since famix parametric update #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
232169d
Change coming from somewhere else. I don't know what this is
Mar 13, 2024
1726320
regenerated the meta-model (that might be the reason form the previou…
Mar 13, 2024
01b5ad2
regenerated the JSON model for the test
Mar 13, 2024
bfe5955
Clarifying comment in methods
Mar 13, 2024
acc691f
regenrated the JSON model used by the tests
Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions src/Carrefour-FastAndBindingGenerator/CRFBinderVisitor.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,23 @@ CRFBinderVisitor >> visitFASTJavaMethodEntity: aFASTJavaMethodEntity [

{ #category : #visitor }
CRFBinderVisitor >> visitFASTJavaMethodInvocation: aFASTJavaMethodInvocation [
(self sourceFamixEntity queryAllOutgoingInvocations
select: [ :invoc |
(invoc hasSourceAnchor
ifTrue: [ | sourceStartPos |
sourceStartPos := self sourceFamixEntityStartPo.
invoc sourceAnchor startPos - sourceStartPos >= (aFASTJavaMethodInvocation startPos - 1)
and: [ invoc sourceAnchor endPos - sourceStartPos <= (aFASTJavaMethodInvocation endPos + 1) ] ]
ifFalse: [ invoc to first name beginsWith: aFASTJavaMethodInvocation name ]) ])
ifNotEmpty: [ :collectionOfPotentialInvoc |
(collectionOfPotentialInvoc sorted: [ :invoc1 :invoc2 | invoc1 sourceAnchor intervalAsCharPos size > invoc2 sourceAnchor intervalAsCharPos size ]) first
fast: aFASTJavaMethodInvocation ].

(self sourceFamixEntity queryAllOutgoingInvocations select: [ :invoc |
invoc hasSourceAnchor
ifTrue: [
| sourceStartPos |
sourceStartPos := self sourceFamixEntityStartPo.
invoc sourceAnchor startPos - sourceStartPos
>= (aFASTJavaMethodInvocation startPos - 1) and: [
invoc sourceAnchor endPos - sourceStartPos
<= (aFASTJavaMethodInvocation endPos + 1) ] ]
ifFalse: [
invoc target first name beginsWith: aFASTJavaMethodInvocation name ] ])
ifNotEmpty: [ :collectionOfPotentialInvoc |
(collectionOfPotentialInvoc sorted: [ :invoc1 :invoc2 |
invoc1 sourceAnchor intervalAsCharPos size
> invoc2 sourceAnchor intervalAsCharPos size ]) first fast:
aFASTJavaMethodInvocation ].
super visitFASTJavaMethodInvocation: aFASTJavaMethodInvocation
]

Expand Down
2 changes: 2 additions & 0 deletions src/Carrefour-Model/CRFModel.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Does not define any entity, but ""imports"" entities from Famix and FAST and add
Class {
#name : #CRFModel,
#superclass : #MooseModel,
#traits : 'FASTJavaTEntityCreator + FASTTEntityCreator + FamixJavaTEntityCreator',
#classTraits : 'FASTJavaTEntityCreator classTrait + FASTTEntityCreator classTrait + FamixJavaTEntityCreator classTrait',
#category : #'Carrefour-Model-Model'
}

Expand Down
Loading
Loading