Mercurial > hg > graal-jvmci-8
comparison graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/TypeSystemParser.java @ 20949:9a83732f97eb
Truffle-DSL: ensure proper wildcards for generics are filled in; remove unused type system node code generator.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Tue, 14 Apr 2015 19:23:33 +0200 |
parents | 18c0f02fa4d2 |
children | f5b49d881909 |
comparison
equal
deleted
inserted
replaced
20948:a0d97b639d57 | 20949:9a83732f97eb |
---|---|
86 if (casts == null || checks == null || implicitCasts == null) { | 86 if (casts == null || checks == null || implicitCasts == null) { |
87 return typeSystem; | 87 return typeSystem; |
88 } | 88 } |
89 | 89 |
90 List<TypeMirror> legacyTypes = ElementUtils.getAnnotationValueList(TypeMirror.class, typeSystem.getTemplateTypeAnnotation(), "value"); | 90 List<TypeMirror> legacyTypes = ElementUtils.getAnnotationValueList(TypeMirror.class, typeSystem.getTemplateTypeAnnotation(), "value"); |
91 for (int i = 0; i < legacyTypes.size(); i++) { | |
92 legacyTypes.set(i, ElementUtils.fillInGenericWildcards(legacyTypes.get(i))); | |
93 } | |
94 | |
91 typeSystem.getLegacyTypes().addAll(legacyTypes); | 95 typeSystem.getLegacyTypes().addAll(legacyTypes); |
92 verifyTypes(typeSystem); | 96 verifyTypes(typeSystem); |
93 typeSystem.getLegacyTypes().add(context.getType(Object.class)); | 97 typeSystem.getLegacyTypes().add(context.getType(Object.class)); |
94 typeSystem.getLegacyTypes().add(context.getType(void.class)); | 98 typeSystem.getLegacyTypes().add(context.getType(void.class)); |
95 verifyNamesUnique(typeSystem); | 99 verifyNamesUnique(typeSystem); |