#135 fix generated compile errors for nested and generic dataype params

eclipse-viatra · Apr 12, 2024 · a170ddf · a170ddf
1 parent 4293f96
commit a170ddf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...src/org/eclipse/viatra/query/patternlanguage/emf/jvmmodel/PatternMatchClassInferrer.xtend b/...src/org/eclipse/viatra/query/patternlanguage/emf/jvmmodel/PatternMatchClassInferrer.xtend
@@ -152,8 +152,8 @@ class PatternMatchClassInferrer {
                 if (!isMutable()) throw new java.lang.UnsupportedOperationException();
                 «FOR variable : pattern.parameters»
                     «val type = variable.calculateType»
-                    if ("«variable.name»".equals(parameterName) «IF typeReference.is(type, Object)»&& newValue instanceof «type»«ENDIF») {
-                        this.«variable.fieldName» = («type») newValue;
+                    if ("«variable.name»".equals(parameterName) «IF typeReference.is(type, Object)»&& newValue instanceof «type.type»«ENDIF») {
+                        this.«variable.fieldName» = («type.type») newValue;
                         return true;
                     }
                 «ENDFOR»

diff --git a/...c/org/eclipse/viatra/query/patternlanguage/emf/jvmmodel/PatternMatcherClassInferrer.xtend b/...c/org/eclipse/viatra/query/patternlanguage/emf/jvmmodel/PatternMatcherClassInferrer.xtend
@@ -240,7 +240,7 @@ class PatternMatcherClassInferrer {
                         parameters += variable.toParameter("parameters", typeRef(Object).addArrayTypeDimension)
                         visibility = JvmVisibility::PROTECTED
                         body = '''
-                            return rawStreamAllValues(«variable.positionConstant», parameters).map(«typeOfVariable».class::cast);
+                            return rawStreamAllValues(«variable.positionConstant», parameters).map(«typeOfVariable.type».class::cast);
                         '''
                     ]
                 type.members += pattern.toMethod("getAllValuesOf" + variable.name, typeRef(Set, typeOfVariable)) [

diff --git a/...se/viatra/query/patternlanguage/emf/jvmmodel/PatternQuerySpecificationClassInferrer.xtend b/...se/viatra/query/patternlanguage/emf/jvmmodel/PatternQuerySpecificationClassInferrer.xtend
@@ -165,7 +165,7 @@ class PatternQuerySpecificationClassInferrer {
                 annotations += annotationRef(Override)
                 parameters += pattern.toParameter("parameters", typeRef(Object).addArrayTypeDimension)
                 varArgs = true
-                body = '''return «matchClass».newMatch(«FOR p : pattern.parameters SEPARATOR ', '»(«p.calculateType.qualifiedName») parameters[«pattern.parameters.indexOf(p)»]«ENDFOR»);'''
+                body = '''return «matchClass».newMatch(«FOR p : pattern.parameters SEPARATOR ', '»(«p.calculateType.type») parameters[«pattern.parameters.indexOf(p)»]«ENDFOR»);'''
             ]
         }
     }

diff --git a/.../org/eclipse/viatra/query/runtime/matchers/context/common/JavaTransitiveInstancesKey.java b/.../org/eclipse/viatra/query/runtime/matchers/context/common/JavaTransitiveInstancesKey.java
@@ -114,7 +114,7 @@ private void resolveClassInternal() throws ClassNotFoundException {
     @Override
     public String getPrettyPrintableName() {
         getWrapperInstanceClass();
-        return cachedWrapperInstanceClass == null ? wrappedKey == null ? "<null>" : wrappedKey : cachedWrapperInstanceClass.getName();
+        return cachedWrapperInstanceClass == null ? wrappedKey == null ? "<null>" : wrappedKey : cachedWrapperInstanceClass.getCanonicalName();
     }
 
     @Override