model: add optional MDoc::original_mentity

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/model/mdoc.nit b/src/model/mdoc.nit
index 919b48c..44ddfea 100644 (file)
--- a/src/model/mdoc.nit
+++ b/src/model/mdoc.nit
@@ -23,6 +23,10 @@ class MDoc
        # The starting `#` and first space are stripped.
        # The trailing `\n` are chomped.
        var content = new Array[String]
+
+       # The entity where the documentation is originally attached to.
+       # This gives some context to resolve identifiers or to run examples.
+       var original_mentity: nullable MEntity writable = null
 end
 
 redef class MEntity

diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index dc48ee9..89e4675 100644 (file)
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -616,7 +616,11 @@ class ModelBuilder
 
                if decl != null then
                        var ndoc = decl.n_doc
-                       if ndoc != null then mmodule.mdoc = ndoc.to_mdoc
+                       if ndoc != null then
+                               var mdoc = ndoc.to_mdoc
+                               mmodule.mdoc = mdoc
+                               mdoc.original_mentity = mmodule
+                       end
                end
 
                return mmodule

diff --git a/src/modelize_class.nit b/src/modelize_class.nit
index a72bfec..f105f5d 100644 (file)
--- a/src/modelize_class.nit
+++ b/src/modelize_class.nit
@@ -163,7 +163,11 @@ redef class ModelBuilder
 
                if nclassdef isa AStdClassdef then
                        var ndoc = nclassdef.n_doc
-                       if ndoc != null then mclassdef.mdoc = ndoc.to_mdoc
+                       if ndoc != null then
+                               var mdoc = ndoc.to_mdoc
+                               mclassdef.mdoc = mdoc
+                               mdoc.original_mentity = mclassdef
+                       end
                end
 
                if mclassdef.is_intro then

diff --git a/src/modelize_property.nit b/src/modelize_property.nit
index 56ff873..09c13e2 100644 (file)
--- a/src/modelize_property.nit
+++ b/src/modelize_property.nit
@@ -293,7 +293,11 @@ redef class APropdef
        private fun set_doc(mpropdef: MPropDef)
        do
                var ndoc = self.n_doc
-               if ndoc != null then mpropdef.mdoc = ndoc.to_mdoc
+               if ndoc != null then
+                       var mdoc = ndoc.to_mdoc
+                       mpropdef.mdoc = mdoc
+                       mdoc.original_mentity = mpropdef
+               end
        end
 
        private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility, mprop: MProperty)