Permalink
Browse files

metamodel #226: refactored c.l.metamodel -> c.l.model

  • Loading branch information...
1 parent bb82e90 commit e8a1e801c66786e64f369c8a653b900a511feb2e @FroMage FroMage committed Jul 29, 2013
Showing with 878 additions and 873 deletions.
  1. +7 −7 build.xml
  2. +1 −1 runtime-js/language-module.txt
  3. +9 −5 runtime/ceylon/language/{metamodel → model}/annotations_.java
  4. +6 −5 runtime/ceylon/language/{metamodel → model}/modules_.java
  5. +3 −3 runtime/ceylon/language/{metamodel → model}/typeLiteral_.java
  6. +4 −4 runtime/ceylon/language/{metamodel → model}/type_.java
  7. +2 −2 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AnnotationBearing.java
  8. +19 −19 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedAttribute.java
  9. +8 −8 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedClass.java
  10. +45 −45 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedClassOrInterface.java
  11. +10 −10 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedFunction.java
  12. +7 −7 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedInterface.java
  13. +11 −11 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedIntersectionType.java
  14. +9 −9 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedMember.java
  15. +13 −13 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedMemberClass.java
  16. +13 −13 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedMemberInterface.java
  17. +16 −16 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedMethod.java
  18. +11 −11 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedUnionType.java
  19. +12 −12 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedValue.java
  20. +3 −3 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedVariable.java
  21. +17 −17 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/AppliedVariableAttribute.java
  22. +8 −8 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeAttribute.java
  23. +23 −23 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeAttributeWithAppliedAttribute.java
  24. +12 −12 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeAttributeWithAppliedValue.java
  25. +26 −26 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeClass.java
  26. +50 −50 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeClassOrInterface.java
  27. +39 −39 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeClassWithAppliedClass.java
  28. +47 −47 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeClassWithAppliedMemberClass.java
  29. +44 −44 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeFunction.java
  30. +3 −3 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeFunctionOrValue.java
  31. +14 −14 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeFunctionWithAppliedFunction.java
  32. +25 −25 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeFunctionWithAppliedMethod.java
  33. +6 −6 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeImport.java
  34. +15 −15 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeInterface.java
  35. +36 −36 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeInterfaceWithAppliedInterface.java
  36. +47 −47 ...me/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeInterfaceWithAppliedMemberInterface.java
  37. +11 −11 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeIntersectionType.java
  38. +16 −16 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeModule.java
  39. +24 −24 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreePackage.java
  40. +27 −27 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeParameterisedType.java
  41. +9 −9 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeSetter.java
  42. +14 −14 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeTopLevelOrMemberDeclaration.java
  43. +5 −5 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeTypeParameter.java
  44. +10 −10 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeTypeParameterType.java
  45. +11 −11 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeUnionType.java
  46. +6 −6 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeVariable.java
  47. +15 −15 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeVariableWithAppliedVariable.java
  48. +31 −31 ...e/com/redhat/ceylon/compiler/java/runtime/metamodel/FreeVariableWithAppliedVariableAttribute.java
  49. +25 −25 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/Metamodel.java
  50. +26 −26 runtime/com/redhat/ceylon/compiler/java/runtime/metamodel/Predicates.java
  51. +2 −2 src/ceylon/language/annotations.ceylon
  52. 0 src/ceylon/language/{metamodel → model}/Annotated.ceylon
  53. 0 src/ceylon/language/{metamodel → model}/Annotation.ceylon
  54. 0 src/ceylon/language/{metamodel → model}/Attribute.ceylon
  55. +2 −2 src/ceylon/language/{metamodel → model}/AttributeModel.ceylon
  56. 0 src/ceylon/language/{metamodel → model}/Class.ceylon
  57. +1 −1 src/ceylon/language/{metamodel → model}/ClassModel.ceylon
  58. +2 −2 src/ceylon/language/{metamodel → model}/ClassOrInterface.ceylon
  59. 0 src/ceylon/language/{metamodel → model}/ConstrainedAnnotation.ceylon
  60. 0 src/ceylon/language/{metamodel → model}/Function.ceylon
  61. +2 −2 src/ceylon/language/{metamodel → model}/FunctionModel.ceylon
  62. 0 src/ceylon/language/{metamodel → model}/Interface.ceylon
  63. +1 −1 src/ceylon/language/{metamodel → model}/InterfaceModel.ceylon
  64. 0 src/ceylon/language/{metamodel → model}/IntersectionType.ceylon
  65. 0 src/ceylon/language/{metamodel → model}/Member.ceylon
  66. 0 src/ceylon/language/{metamodel → model}/MemberClass.ceylon
  67. 0 src/ceylon/language/{metamodel → model}/MemberInterface.ceylon
  68. 0 src/ceylon/language/{metamodel → model}/Method.ceylon
  69. +1 −1 src/ceylon/language/{metamodel → model}/Model.ceylon
  70. +1 −1 src/ceylon/language/{metamodel → model}/OptionalAnnotation.ceylon
  71. +1 −1 src/ceylon/language/{metamodel → model}/SequencedAnnotation.ceylon
  72. 0 src/ceylon/language/{metamodel → model}/Type.ceylon
  73. 0 src/ceylon/language/{metamodel → model}/UnionType.ceylon
  74. 0 src/ceylon/language/{metamodel → model}/Value.ceylon
  75. 0 src/ceylon/language/{metamodel → model}/Variable.ceylon
  76. 0 src/ceylon/language/{metamodel → model}/VariableAttribute.ceylon
  77. 0 src/ceylon/language/{metamodel → model}/annotations.ceylon
  78. +2 −2 src/ceylon/language/{metamodel → model}/declaration/AnnotatedDeclaration.ceylon
  79. +1 −1 src/ceylon/language/{metamodel → model}/declaration/ClassDeclaration.ceylon
  80. +1 −1 src/ceylon/language/{metamodel → model}/declaration/ClassOrInterfaceDeclaration.ceylon
  81. 0 src/ceylon/language/{metamodel → model}/declaration/Declaration.ceylon
  82. +1 −1 src/ceylon/language/{metamodel → model}/declaration/FunctionDeclaration.ceylon
  83. 0 src/ceylon/language/{metamodel → model}/declaration/FunctionOrValueDeclaration.ceylon
  84. 0 src/ceylon/language/{metamodel → model}/declaration/FunctionalDeclaration.ceylon
  85. 0 src/ceylon/language/{metamodel → model}/declaration/GenericDeclaration.ceylon
  86. +1 −1 src/ceylon/language/{metamodel → model}/declaration/InterfaceDeclaration.ceylon
  87. +1 −1 src/ceylon/language/{metamodel → model}/declaration/ModuleAndPackage.ceylon
  88. 0 src/ceylon/language/{metamodel → model}/declaration/OpenIntersection.ceylon
  89. 0 src/ceylon/language/{metamodel → model}/declaration/OpenParameterisedType.ceylon
  90. 0 src/ceylon/language/{metamodel → model}/declaration/OpenType.ceylon
  91. 0 src/ceylon/language/{metamodel → model}/declaration/OpenTypeVariable.ceylon
  92. 0 src/ceylon/language/{metamodel → model}/declaration/OpenUnion.ceylon
  93. 0 src/ceylon/language/{metamodel → model}/declaration/ParameterDeclaration.ceylon
  94. +1 −1 src/ceylon/language/{metamodel → model}/declaration/SetterDeclaration.ceylon
  95. +1 −1 src/ceylon/language/{metamodel → model}/declaration/TopLevelOrMemberDeclaration.ceylon
  96. 0 src/ceylon/language/{metamodel → model}/declaration/TypeParameter.ceylon
  97. 0 src/ceylon/language/{metamodel → model}/declaration/TypedDeclaration.ceylon
  98. +1 −1 src/ceylon/language/{metamodel → model}/declaration/ValueDeclaration.ceylon
  99. 0 src/ceylon/language/{metamodel → model}/declaration/VariableDeclaration.ceylon
  100. 0 src/ceylon/language/{metamodel → model}/declaration/nothingType.ceylon
  101. +1 −1 src/ceylon/language/{metamodel → model}/declaration/package.ceylon
  102. +1 −1 src/ceylon/language/{metamodel → model}/metamodel.ceylon
  103. +1 −1 src/ceylon/language/{metamodel → model}/modules.ceylon
  104. 0 src/ceylon/language/{metamodel → model}/nothingType.ceylon
  105. +1 −1 src/ceylon/language/{metamodel → model}/package.ceylon
View
@@ -239,13 +239,13 @@
<exclude name="ceylon/language/flatten.ceylon"/>
<include name="ceylon/language/flatten_.java"/>
<include name="ceylon/language/unflatten_.java"/>
- <exclude name="ceylon/language/metamodel/metamodel.ceylon"/>
- <include name="ceylon/language/metamodel/type_.java"/>
- <include name="ceylon/language/metamodel/typeLiteral_.java"/>
- <exclude name="ceylon/language/metamodel/annotations.ceylon"/>
- <include name="ceylon/language/metamodel/annotations_.java"/>
- <exclude name="ceylon/language/metamodel/modules.ceylon"/>
- <include name="ceylon/language/metamodel/modules_.java"/>
+ <exclude name="ceylon/language/model/metamodel.ceylon"/>
+ <include name="ceylon/language/model/type_.java"/>
+ <include name="ceylon/language/model/typeLiteral_.java"/>
+ <exclude name="ceylon/language/model/annotations.ceylon"/>
+ <include name="ceylon/language/model/annotations_.java"/>
+ <exclude name="ceylon/language/model/modules.ceylon"/>
+ <include name="ceylon/language/model/modules_.java"/>
</files>
</ceylon-compile>
</target>
@@ -37,6 +37,6 @@ every,first,forItem,forKey,greaterThan,join,largest,lessThan,max,min,smallest,su
identical,compose,shuffle,plus,times,combine,sort,sequences.js,strings.js,parseInteger
#metamodel
-metamodel/Annotated,metamodel/Annotation,metamodel/Attribute,metamodel/AttributeModel,metamodel/Class,metamodel/ClassModel,metamodel/ClassOrInterface,metamodel/ConstrainedAnnotation,metamodel/Function,metamodel/FunctionModel,metamodel/Interface,metamodel/InterfaceModel,metamodel/IntersectionType,metamodel/Member,metamodel/MemberClass,metamodel/MemberInterface,metamodel/Method,metamodel/Model,metamodel/OptionalAnnotation,metamodel/SequencedAnnotation,metamodel/Type,metamodel/UnionType,metamodel/Value,metamodel/Variable,metamodel/VariableAttribute,metamodel/annotations,metamodel/modules,metamodel/nothingType,metamodel/declaration/AnnotatedDeclaration,metamodel/declaration/ValueDeclaration,metamodel/declaration/ClassDeclaration,metamodel/declaration/ClassOrInterfaceDeclaration,metamodel/declaration/Declaration,metamodel/declaration/FunctionDeclaration,metamodel/declaration/FunctionOrValueDeclaration,metamodel/declaration/FunctionalDeclaration,metamodel/declaration/GenericDeclaration,metamodel/declaration/InterfaceDeclaration,metamodel/declaration/ModuleAndPackage,metamodel/declaration/OpenIntersection,metamodel/declaration/OpenParameterisedType,metamodel/declaration/OpenType,metamodel/declaration/OpenTypeVariable,metamodel/declaration/OpenUnion,metamodel/declaration/ParameterDeclaration,metamodel/declaration/SetterDeclaration,metamodel/declaration/TopLevelOrMemberDeclaration,metamodel/declaration/TypeParameter,metamodel/declaration/TypedDeclaration,metamodel/declaration/VariableDeclaration,metamodel/declaration/nothingType
+model/Annotated,model/Annotation,model/Attribute,model/AttributeModel,model/Class,model/ClassModel,model/ClassOrInterface,model/ConstrainedAnnotation,model/Function,model/FunctionModel,model/Interface,model/InterfaceModel,model/IntersectionType,model/Member,model/MemberClass,model/MemberInterface,model/Method,model/Model,model/OptionalAnnotation,model/SequencedAnnotation,model/Type,model/UnionType,model/Value,model/Variable,model/VariableAttribute,model/annotations,model/modules,model/nothingType,model/declaration/AnnotatedDeclaration,model/declaration/ValueDeclaration,model/declaration/ClassDeclaration,model/declaration/ClassOrInterfaceDeclaration,model/declaration/Declaration,model/declaration/FunctionDeclaration,model/declaration/FunctionOrValueDeclaration,model/declaration/FunctionalDeclaration,model/declaration/GenericDeclaration,model/declaration/InterfaceDeclaration,model/declaration/ModuleAndPackage,model/declaration/OpenIntersection,model/declaration/OpenParameterisedType,model/declaration/OpenType,model/declaration/OpenTypeVariable,model/declaration/OpenUnion,model/declaration/ParameterDeclaration,model/declaration/SetterDeclaration,model/declaration/TopLevelOrMemberDeclaration,model/declaration/TypeParameter,model/declaration/TypedDeclaration,model/declaration/VariableDeclaration,model/declaration/nothingType
annotations
metamodel.js,metamodel_types.js,numbers.js,strings.js,misc1.js,functions.js,functions2.js,sequences.js,process.js,functions3.js,annotations.js
@@ -1,7 +1,11 @@
-package ceylon.language.metamodel;
+package ceylon.language.model;
import ceylon.language.Sequence;
import ceylon.language.Sequential;
+import ceylon.language.model.Annotation;
+import ceylon.language.model.ClassOrInterface;
+import ceylon.language.model.ConstrainedAnnotation;
+import ceylon.language.model.OptionalAnnotation;
import com.redhat.ceylon.compiler.java.metadata.Annotations;
import com.redhat.ceylon.compiler.java.metadata.Ceylon;
@@ -25,11 +29,11 @@ private annotations_() {
@Annotations({@com.redhat.ceylon.compiler.java.metadata.Annotation("shared")})
@TypeInfo("Values")
@TypeParameters({
- @TypeParameter(value = "Value", satisfies = {"ceylon.language.metamodel::ConstrainedAnnotation<Value,Values,ProgramElement>"}),
+ @TypeParameter(value = "Value", satisfies = {"ceylon.language.model::ConstrainedAnnotation<Value,Values,ProgramElement>"}),
@TypeParameter(value = "Values"),
- @TypeParameter(value = "ProgramElement", satisfies = {"ceylon.language.metamodel::Annotated"})
+ @TypeParameter(value = "ProgramElement", satisfies = {"ceylon.language.model::Annotated"})
})
- public static <Value extends ConstrainedAnnotation<? extends Value, ? extends Values, ? super ProgramElement>, Values, ProgramElement extends ceylon.language.metamodel.Annotated>
+ public static <Value extends ConstrainedAnnotation<? extends Value, ? extends Values, ? super ProgramElement>, Values, ProgramElement extends ceylon.language.model.Annotated>
Values annotations(
@Ignore
final TypeDescriptor $reifiedValue,
@@ -38,7 +42,7 @@ Values annotations(
@Ignore
final TypeDescriptor $reifiedProgramElement,
@Name("annotationType")
- @TypeInfo("ceylon.language.metamodel::ClassOrInterface<ceylon.language.metamodel::ConstrainedAnnotation<Value,Values,ProgramElement>>")
+ @TypeInfo("ceylon.language.model::ClassOrInterface<ceylon.language.model::ConstrainedAnnotation<Value,Values,ProgramElement>>")
final ClassOrInterface<? extends ConstrainedAnnotation<? extends Value, ? extends Values, ? super ProgramElement>> annotationType,
@Name("programElement")
@TypeInfo("ProgramElement")
@@ -1,7 +1,8 @@
-package ceylon.language.metamodel;
+package ceylon.language.model;
import ceylon.language.Sequential;
-import ceylon.language.metamodel.declaration.Module;
+import ceylon.language.model.modules_;
+import ceylon.language.model.declaration.Module;
import com.redhat.ceylon.compiler.java.metadata.Ceylon;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
@@ -23,17 +24,17 @@ private modules_() {}
return value;
}
- @TypeInfo("ceylon.language::Sequential<ceylon.language.metamodel.declaration::Module>")
+ @TypeInfo("ceylon.language::Sequential<ceylon.language.model.declaration::Module>")
public Sequential<? extends Module> getList(){
return Metamodel.getModuleList();
}
- @TypeInfo("ceylon.language.metamodel.declaration::Module|ceylon.language::Null")
+ @TypeInfo("ceylon.language.model.declaration::Module|ceylon.language::Null")
public Module find(@Name("name") String name, @Name("version") String version){
return Metamodel.findLoadedModule(name, version);
}
- @TypeInfo("ceylon.language.metamodel.declaration::Module|ceylon.language::Null")
+ @TypeInfo("ceylon.language.model.declaration::Module|ceylon.language::Null")
public Module getDefault(){
return Metamodel.getDefaultModule();
}
@@ -1,4 +1,4 @@
-package ceylon.language.metamodel;
+package ceylon.language.model;
import com.redhat.ceylon.compiler.java.metadata.Ceylon;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
@@ -16,9 +16,9 @@
private typeLiteral_() {}
- @TypeInfo("ceylon.language.metamodel::Type")
+ @TypeInfo("ceylon.language.model::Type")
@TypeParameters(@TypeParameter(value = "Type", variance = Variance.OUT, satisfies = "ceylon.language::Anything"))
- public static <Type> ceylon.language.metamodel.Type typeLiteral(@Ignore TypeDescriptor $reifiedType) {
+ public static <Type> ceylon.language.model.Type typeLiteral(@Ignore TypeDescriptor $reifiedType) {
return Metamodel.getAppliedMetamodel($reifiedType);
}
}
@@ -1,4 +1,4 @@
-package ceylon.language.metamodel;
+package ceylon.language.model;
import ceylon.language.Sequential;
@@ -20,10 +20,10 @@
private type_() {}
@TypeParameters(@TypeParameter(value = "Type", variance = Variance.OUT, satisfies = "ceylon.language::Anything"))
- @TypeInfo("ceylon.language.metamodel::Class<Type,ceylon.language::Nothing>")
- public static <Type> ceylon.language.metamodel.Class<? extends Type, ? super Sequential<? extends Object>> type(
+ @TypeInfo("ceylon.language.model::Class<Type,ceylon.language::Nothing>")
+ public static <Type> ceylon.language.model.Class<? extends Type, ? super Sequential<? extends Object>> type(
@Ignore TypeDescriptor $reifiedType,
@Name("instance") @TypeInfo("Type") Type instance) {
- return (ceylon.language.metamodel.Class) Metamodel.getAppliedMetamodel(Metamodel.getTypeDescriptor(instance));
+ return (ceylon.language.model.Class) Metamodel.getAppliedMetamodel(Metamodel.getTypeDescriptor(instance));
}
}
@@ -1,12 +1,12 @@
package com.redhat.ceylon.compiler.java.runtime.metamodel;
-import ceylon.language.metamodel.Annotated;
+import ceylon.language.model.Annotated;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
/**
* Interface for {@code Free*} and {@code Applied*} implementors of
- * {@code ceylon.language.metamodel.Annotated} which gets the
+ * {@code ceylon.language.model.Annotated} which gets the
* Java annotations from the underyling Java reflection object.
* @author tom
*/
@@ -1,10 +1,10 @@
package com.redhat.ceylon.compiler.java.runtime.metamodel;
-import ceylon.language.metamodel.Attribute$impl;
-import ceylon.language.metamodel.AttributeModel$impl;
-import ceylon.language.metamodel.Model$impl;
-import ceylon.language.metamodel.Value;
-import ceylon.language.metamodel.declaration.ValueDeclaration;
+import ceylon.language.model.Attribute$impl;
+import ceylon.language.model.AttributeModel$impl;
+import ceylon.language.model.Model$impl;
+import ceylon.language.model.Value;
+import ceylon.language.model.declaration.ValueDeclaration;
import com.redhat.ceylon.compiler.java.metadata.Ceylon;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
@@ -23,12 +23,12 @@
@TypeParameter(value = "Type", variance = Variance.OUT),
})
public class AppliedAttribute<Container, Type>
- extends AppliedMember<Container, ceylon.language.metamodel.Value<? extends Type>>
- implements ceylon.language.metamodel.Attribute<Container, Type> {
+ extends AppliedMember<Container, ceylon.language.model.Value<? extends Type>>
+ implements ceylon.language.model.Attribute<Container, Type> {
protected FreeAttribute declaration;
protected ProducedTypedReference typedReference;
- private ceylon.language.metamodel.Type closedType;
+ private ceylon.language.model.Type closedType;
@Ignore
protected final TypeDescriptor $reifiedType;
@@ -40,8 +40,8 @@ public String toString() {
public AppliedAttribute(@Ignore TypeDescriptor $reifiedContainer,
@Ignore TypeDescriptor $reifiedType,
FreeAttribute declaration, ProducedTypedReference typedReference,
- ceylon.language.metamodel.ClassOrInterface<? extends Object> container) {
- super($reifiedContainer, TypeDescriptor.klass(ceylon.language.metamodel.Value.class, $reifiedType), container);
+ ceylon.language.model.ClassOrInterface<? extends Object> container) {
+ super($reifiedContainer, TypeDescriptor.klass(ceylon.language.model.Value.class, $reifiedType), container);
this.declaration = declaration;
this.typedReference = typedReference;
this.closedType = Metamodel.getAppliedMetamodel(typedReference.getType());
@@ -50,34 +50,34 @@ public AppliedAttribute(@Ignore TypeDescriptor $reifiedContainer,
@Override
@Ignore
- public AttributeModel$impl<Type> $ceylon$language$metamodel$AttributeModel$impl() {
+ public AttributeModel$impl<Type> $ceylon$language$model$AttributeModel$impl() {
// TODO Auto-generated method stub
return null;
}
@Override
@Ignore
- public Model$impl $ceylon$language$metamodel$Model$impl() {
+ public Model$impl $ceylon$language$model$Model$impl() {
// TODO Auto-generated method stub
return null;
}
@Override
@Ignore
- public Attribute$impl<Container, Type> $ceylon$language$metamodel$Attribute$impl() {
+ public Attribute$impl<Container, Type> $ceylon$language$model$Attribute$impl() {
// TODO Auto-generated method stub
return null;
}
@Override
- @TypeInfo("ceylon.language.metamodel.declaration::ValueDeclaration")
+ @TypeInfo("ceylon.language.model.declaration::ValueDeclaration")
public ValueDeclaration getDeclaration() {
return declaration;
}
@Override
- @TypeInfo("ceylon.language.metamodel::Type")
- public ceylon.language.metamodel.Type getType() {
+ @TypeInfo("ceylon.language.model::Type")
+ public ceylon.language.model.Type getType() {
return closedType;
}
@@ -92,13 +92,13 @@ public ValueDeclaration getDeclaration() {
return TypeDescriptor.klass(AppliedAttribute.class, super.$reifiedType, $reifiedType);
}
- public static ceylon.language.metamodel.Attribute instance(@Ignore TypeDescriptor $reifiedSubType, @Ignore TypeDescriptor reifiedValueType,
+ public static ceylon.language.model.Attribute instance(@Ignore TypeDescriptor $reifiedSubType, @Ignore TypeDescriptor reifiedValueType,
FreeAttribute value, ProducedTypedReference valueTypedReference,
com.redhat.ceylon.compiler.typechecker.model.TypedDeclaration decl,
- ceylon.language.metamodel.ClassOrInterface<? extends Object> container) {
+ ceylon.language.model.ClassOrInterface<? extends Object> container) {
// if the container has no TP, the declaration will also be an Attribute
if(!Metamodel.hasTypeParameters((Generic) decl.getContainer()))
- return (ceylon.language.metamodel.Attribute) Metamodel.getOrCreateMetamodel(decl);
+ return (ceylon.language.model.Attribute) Metamodel.getOrCreateMetamodel(decl);
return decl.isVariable()
? new AppliedVariableAttribute($reifiedSubType, reifiedValueType, value, valueTypedReference, container)
: new AppliedAttribute($reifiedSubType, reifiedValueType, value, valueTypedReference, container);
@@ -9,8 +9,8 @@
import ceylon.language.Callable;
import ceylon.language.Sequential;
-import ceylon.language.metamodel.Class$impl;
-import ceylon.language.metamodel.ClassModel$impl;
+import ceylon.language.model.Class$impl;
+import ceylon.language.model.ClassModel$impl;
import com.redhat.ceylon.compiler.java.metadata.Ceylon;
import com.redhat.ceylon.compiler.java.metadata.Ignore;
@@ -31,7 +31,7 @@
})
public class AppliedClass<Type, Arguments extends Sequential<? extends Object>>
extends AppliedClassOrInterface<Type>
- implements ceylon.language.metamodel.Class<Type, Arguments>, Callable<Type> {
+ implements ceylon.language.model.Class<Type, Arguments>, Callable<Type> {
private TypeDescriptor $reifiedArguments;
private MethodHandle constructor;
@@ -50,22 +50,22 @@ public AppliedClass(@Ignore TypeDescriptor $reifiedType,
@Override
@Ignore
- public Class$impl<Type, Arguments> $ceylon$language$metamodel$Class$impl() {
+ public Class$impl<Type, Arguments> $ceylon$language$model$Class$impl() {
// TODO Auto-generated method stub
return null;
}
@Override
@Ignore
- public ClassModel$impl<Type, Arguments> $ceylon$language$metamodel$ClassModel$impl() {
+ public ClassModel$impl<Type, Arguments> $ceylon$language$model$ClassModel$impl() {
// TODO Auto-generated method stub
return null;
}
@Override
- @TypeInfo("ceylon.language.metamodel.declaration::ClassDeclaration")
- public ceylon.language.metamodel.declaration.ClassDeclaration getDeclaration() {
- return (ceylon.language.metamodel.declaration.ClassDeclaration) super.getDeclaration();
+ @TypeInfo("ceylon.language.model.declaration::ClassDeclaration")
+ public ceylon.language.model.declaration.ClassDeclaration getDeclaration() {
+ return (ceylon.language.model.declaration.ClassDeclaration) super.getDeclaration();
}
@Override
Oops, something went wrong.

0 comments on commit e8a1e80

Please sign in to comment.