X-Git-Url: http://nitlanguage.org

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 1c0eb21..270c185 100644
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -352,11 +352,17 @@ abstract class Prod
 	do
 		var res = new Array[AAnnotation]
 		var nas = n_annotations
-		if nas == null then return res
-		for na in nas.n_items do
+		if nas != null then for na in nas.n_items do
 			if na.name != name then continue
 			res.add(na)
 		end
+		if self isa AClassdef then for na in n_propdefs do
+			if na isa AAnnotPropdef then
+				if na.name != name then continue
+				res.add na
+			end
+		end
+
 		return res
 	end
 
@@ -1067,12 +1073,13 @@ class AStdClassdef
 	# The extern block code
 	var n_extern_code_block: nullable AExternCodeBlock = null is writable
 
-	# The list of super-classes
-	var n_superclasses = new ANodes[ASuperclass](self)
-
 	# The `end` keyword
 	var n_kwend: TKwend is writable, noinit
 
+	fun n_superclasses: Array[ASuperPropdef] do
+		return [for d in n_propdefs do if d isa ASuperPropdef then d]
+	end
+
 	redef fun hot_location do return n_id.location
 end
 
@@ -1148,17 +1155,6 @@ class AFormaldef
 	var n_type: nullable AType = null is writable
 end
 
-# A super-class. eg `super X`
-class ASuperclass
-	super Prod
-
-	# The super keyword
-	var n_kwsuper: TKwsuper is writable, noinit
-
-	# The super-class (indicated as a type)
-	var n_type: AType is writable, noinit
-end
-
 # The definition of a property
 abstract class APropdef
 	super ADefinition
@@ -1237,6 +1233,23 @@ class AMainMethPropdef
 	super AMethPropdef
 end
 
+class AAnnotPropdef
+	super APropdef
+	super AAnnotation
+end
+
+# A super-class. eg `super X`
+class ASuperPropdef
+	super APropdef
+
+	# The super keyword
+	var n_kwsuper: TKwsuper is writable, noinit
+
+	# The super-class (indicated as a type)
+	var n_type: AType is writable, noinit
+end
+
+
 # Declaration of callbacks for extern methods
 class AExternCalls
 	super Prod