- internal support

diff --git a/src/doclets/htmlhelpers/doclet/langlet.vala b/src/doclets/htmlhelpers/doclet/langlet.vala
index 0046ce947da02e321a9d2f87a4a73babe8d099e1..8e321de2d2bc67d25fec743d127ed2103a218b6c 100755 (executable)
--- a/src/doclets/htmlhelpers/doclet/langlet.vala
+++ b/src/doclets/htmlhelpers/doclet/langlet.vala
@@ -335,6 +335,8 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
                                file.puts ( "protected " );
                        else if ( propac.is_private )
                                file.puts ( "private " );
+                       else if ( propac.is_internal )
+                               file.puts ( "internal " );
                }
 
                if ( propac.is_owned )
@@ -430,6 +432,8 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
                        file.printf ( "<span class=\"%s\">protected</span> ", css_keyword );
                else if ( element.is_private )
                        file.printf ( "<span class=\"%s\">private</span> ", css_keyword );
+               else if ( element.is_internal )
+                       file.printf ( "<span class=\"%s\">internal</span> ", css_keyword );
        }
 
 

diff --git a/src/doclets/htmlhelpers/languages/vala.vala b/src/doclets/htmlhelpers/languages/vala.vala
index ed3c5b4c194e9946ab55672ba60a9857ac2fa2dd..da848441eb296cdc786d28f460392214a169973b 100755 (executable)
--- a/src/doclets/htmlhelpers/languages/vala.vala
+++ b/src/doclets/htmlhelpers/languages/vala.vala
@@ -250,6 +250,9 @@ public class Valadoc.Html.Api.Vala {
                else if (symbol.is_protected) {
                        return "protected ";
                }
+               else if (symbol.is_internal) {
+                       return "internal ";
+               }
                else {
                        return "private ";
                }
@@ -544,9 +547,12 @@ public class Valadoc.Html.Api.Vala {
                else if (propac.is_public) {
                        str.append ("public ");
                }
-               else {
+               else if (propac.is_protected) {
                        str.append ("protected ");
                }
+               else {
+                       str.append ("internal ");
+               }
 
                if (propac.is_owned) {
                        str.append ("owned ");

diff --git a/src/libvaladoc/apitree.vala b/src/libvaladoc/apitree.vala
index db3f4967bf80997ea0f2d0e68332887d7b416d88..a0f5699e069f5a1d7888d6aeb9ce745e6ff8d28a 100755 (executable)
--- a/src/libvaladoc/apitree.vala
+++ b/src/libvaladoc/apitree.vala
@@ -1097,24 +1097,30 @@ public interface Valadoc.StructHandler : Basic {
 
 
 public interface Valadoc.Visitable : Basic, SymbolAccessibility {
-       protected bool is_type_visitor_accessible ( Valadoc.Basic element ) {
-               if ( !this.settings._private && this.is_private )
+       protected bool is_type_visitor_accessible (Valadoc.Basic element) {
+               if (!this.settings._private && this.is_private)
                        return false;
 
-               if ( !this.settings._protected && this.is_protected )
+               if (!this.settings._internal && this.is_internal)
                        return false;
 
-               if ( this.parent != element && !this.settings.add_inherited )
+               if (!this.settings._protected && this.is_protected)
+                       return false;
+
+               if (this.parent != element && !this.settings.add_inherited)
                                return false;
 
                return true;
        }
 
        public bool is_visitor_accessible ( ) {
-               if ( !this.settings._private && this.is_private )
+               if (!this.settings._private && this.is_private)
+                       return false;
+
+               if (!this.settings._internal && this.is_internal)
                        return false;
 
-               if ( !this.settings._protected && this.is_protected )
+               if (!this.settings._protected && this.is_protected)
                        return false;
 
                return true;
@@ -1133,14 +1139,21 @@ public interface Valadoc.SymbolAccessibility : Basic {
        public bool is_protected {
                get {
                        Vala.SymbolAccessibility access = vsymbol.access;
-                       return ( access == Vala.SymbolAccessibility.PROTECTED );
+                       return (access == Vala.SymbolAccessibility.PROTECTED);
+               }
+       }
+
+       public bool is_internal {
+               get {
+                       Vala.SymbolAccessibility access = vsymbol.access;
+                       return (access == Vala.SymbolAccessibility.INTERNAL);
                }
        }
 
        public bool is_private {
                get {
                        Vala.SymbolAccessibility access = vsymbol.access;
-                       return ( access == Vala.SymbolAccessibility.PRIVATE );
+                       return (access == Vala.SymbolAccessibility.PRIVATE);
                }
        }
 }
@@ -1999,6 +2012,12 @@ public class Valadoc.PropertyAccessor : Object {
                }
        }
 
+       public bool is_internal {
+               get {
+                       return this.vpropacc.access == Vala.SymbolAccessibility.INTERNAL;
+               }
+       }
+
        public bool is_set {
                get {
                        return this.vpropacc.writable;

diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index 7595f8bf847ef42e8285452b9a58798bc5c9b00a..d5129e5d77008f16e3771e3129640b3e4e78a0bd 100755 (executable)
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -28,6 +28,7 @@ public class Valadoc.Settings : Object {
 
        public bool _private = false;
        public bool _protected = false;
+       public bool _internal = false;
        public bool with_deps = false;
        public bool add_inherited = false;
        public bool verbose = false;

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 1863d2996b228a8201a31b0a71a7dd7e1e0168f4..0558955029752d5951bc806ba9f8015d20fd8354 100755 (executable)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -34,6 +34,7 @@ public class ValaDoc : Object {
 
        private static bool add_inherited = false;
        private static bool _protected = false;
+       private static bool _internal = false;
        private static bool with_deps = false;
        private static bool _private = false;
        private static bool version = false;
@@ -77,6 +78,7 @@ public class ValaDoc : Object {
                { "doclet", 0, 0, OptionArg.STRING, ref pluginpath, "plugin", "Name of an included doclet or path to custom doclet" },
 
                { "protected", 0, 0, OptionArg.NONE, ref _protected, "Adds protected elements to documentation", null },
+               { "internal", 0, 0, OptionArg.NONE, ref _internal, "Adds internal elements to documentation", null },
                { "private", 0, 0, OptionArg.NONE, ref _private, "Adds private elements to documentation", null },
 //             { "inherit", 0, 0, OptionArg.NONE, ref add_inherited, "Adds inherited elements to a class", null },
                { "package-name", 0, 0, OptionArg.STRING, ref pkg_name, "package name", "DIRECTORY" },
@@ -130,6 +132,7 @@ public class ValaDoc : Object {
                settings.pkg_version = this.pkg_version;
                settings.add_inherited = this.add_inherited;
                settings._protected = this._protected;
+               settings._internal = this._internal;
                settings.with_deps = this.with_deps;
                settings._private = this._private;
                settings.path = realpath (this.directory);