From 07b6ecf92c21f6bcf1e221cb5497e306856b4f23 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Christophe=20Beaupr=C3=A9?=
 <jcbrinfo@users.noreply.github.com>
Date: Mon, 1 Dec 2014 14:19:58 -0500
Subject: [PATCH] neo: Handle inner classes.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
---
 src/neo.nit |   31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/neo.nit b/src/neo.nit
index eebd408..1bed82a 100644
--- a/src/neo.nit
+++ b/src/neo.nit
@@ -94,8 +94,8 @@
 # `MProperty`
 #
 # * labels: `MProperty`, `model_name` and `MEntity`. Must also have `MMethod`,
-# `MAttribute` or `MVirtualTypeProp`, depending on the class of the represented
-# entity.
+# `MAttribute` `MVirtualTypeProp` or `MInnerClass`, depending on the class of
+# the represented entity.
 # * `full_name`: fully qualified name.
 # * `visibility`: visibility of the property.
 # * `is_init`: Indicates if the property is a constructor. Exists only if the
@@ -103,11 +103,15 @@
 # * `(:MProperty)-[:INTRO_CLASSDEF]->(:MClassDef)`: classdef that introduces
 # the property.
 #
+# Additional relationship for `MInnerClass`:
+#
+# * `(:MInnerClassDef)-[:NESTS]->(:MClass)`: actual inner class.
+#
 # `MPropDef`
 #
 # * labels: `MPropDef`, `model_name` and `MEntity`. Must also have `MMethodDef`,
-# `MAttributeDef` or `MVirtualTypeDef`, depending on the class of the
-# represented entity.
+# `MAttributeDef`, `MVirtualTypeDef` or `MInnerClassDef`, depending on the
+# class of the represented entity.
 # * `location`: origin of the definition. SEE: `Location.to_s`.
 # * `(:MPropDef)-[:DEFINES]->(:MProperty)`: associated property.
 #
@@ -130,6 +134,11 @@
 # is bound in this definition. Exists only if this definition bound the virtual
 # type to an effective type.
 #
+# Additional relationship for `MInnerClassDef`:
+#
+# * `(:MInnerClassDef)-[:NESTS]->(:MClassDef)`: actual inner class'
+# definition.
+#
 # `MType`
 #
 # * labels: `MType`, `model_name` and `MEntity`. Must also have `MClassType`,
@@ -568,6 +577,9 @@ class NeoModel
 			node.labels.add "MAttribute"
 		else if mproperty isa MVirtualTypeProp then
 			node.labels.add "MVirtualTypeProp"
+		else if mproperty isa MInnerClass then
+			node.labels.add "MInnerClass"
+			node.out_edges.add(new NeoEdge(node, "NESTS", to_node(mproperty.inner)))
 		end
 		node.out_edges.add(new NeoEdge(node, "INTRO_CLASSDEF", to_node(mproperty.intro_mclassdef)))
 		return node
@@ -592,6 +604,9 @@ class NeoModel
 			mprop = new MAttribute(intro_mclassdef, name, visibility)
 		else if node.labels.has("MVirtualTypeProp") then
 			mprop = new MVirtualTypeProp(intro_mclassdef, name, visibility)
+		else if node.labels.has("MInnerClass") then
+			var inner = to_mclass(model, node.out_nodes("NESTS").first)
+			mprop = new MInnerClass(intro_mclassdef, name, visibility, inner)
 		end
 		if mprop == null then
 			print "not yet implemented to_mproperty for {node.labels.join(",")}"
@@ -629,6 +644,9 @@ class NeoModel
 			if bound != null then
 				node.out_edges.add(new NeoEdge(node, "BOUND", to_node(bound)))
 			end
+		else if mpropdef isa MInnerClassDef then
+			node.labels.add "MInnerClassDef"
+			node.out_edges.add(new NeoEdge(node, "NESTS", to_node(mpropdef.inner)))
 		end
 		return node
 	end
@@ -662,6 +680,11 @@ class NeoModel
 			mentities[node.id.as(Int)] = mpropdef
 			var bound = node.out_nodes("BOUND")
 			if not bound.is_empty then mpropdef.bound = to_mtype(model, bound.first)
+		else if node.labels.has("MInnerClassDef") then
+			var inner = to_mclassdef(model, node.out_nodes("NESTS").first)
+			mpropdef = new MInnerClassDef(mclassdef,
+					mproperty.as(MInnerClass), location, inner)
+			mentities[node.id.as(Int)] = mpropdef
 		end
 		if mpropdef == null then
 			print "not yet implemented to_mpropdef for {node.labels.join(",")}"
-- 
1.7.9.5