From e80ebd1c1a6fe7749c1565c4a9e2fccaa07d5d95 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 11 Nov 2015 15:50:48 +0200
Subject: Add package::internal() predicate

---
 brep/package                     | 3 +++
 brep/package-details.cxx         | 2 +-
 brep/package-version-details.cxx | 6 +++---
 brep/package.cxx                 | 2 +-
 brep/page.cxx                    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'brep')

diff --git a/brep/package b/brep/package
index ef73542..8fc6a43 100644
--- a/brep/package
+++ b/brep/package
@@ -407,6 +407,9 @@ namespace brep
     //
     package (std::string name, version_type, std::shared_ptr<repository_type>);
 
+    bool
+    internal () const noexcept {return internal_repository != nullptr;}
+
     // Manifest data.
     //
     package_id id;
diff --git a/brep/package-details.cxx b/brep/package-details.cxx
index 0424d5b..12480c8 100644
--- a/brep/package-details.cxx
+++ b/brep/package-details.cxx
@@ -198,7 +198,7 @@ namespace brep
       if (p->license_alternatives != ll)
         s << TR_LICENSE (p->license_alternatives);
 
-      assert (p->internal_repository != nullptr);
+      assert (p->internal ());
 
       // @@ Shouldn't we make package location to be a link to the proper
       //    place of the About page, describing corresponding repository?
diff --git a/brep/package-version-details.cxx b/brep/package-version-details.cxx
index a4fa95a..9c90b8d 100644
--- a/brep/package-version-details.cxx
+++ b/brep/package-version-details.cxx
@@ -131,7 +131,7 @@ namespace brep
       // If the requested package turned up to be an "external" one just
       // respond that no "internal" package is present.
       //
-      not_found = p->internal_repository == nullptr;
+      not_found = !p->internal ();
     }
     catch (const object_not_persistent& )
     {
@@ -212,7 +212,7 @@ namespace brep
           shared_ptr<package> p (d.package.load ());
           string en (mime_url_encode (p->id.name));
 
-          if (p->internal_repository != nullptr)
+          if (p->internal ())
             s << A << HREF << "/go/" << en << ~HREF << p->id.name << ~A;
           else
             // @@ Refer to package repository URL when supported in repository
@@ -224,7 +224,7 @@ namespace brep
           {
             s << ' ';
 
-            if (p->internal_repository != nullptr)
+            if (p->internal ())
               s << A
                 << HREF << "/go/" << en << "/" << p->version.string () << ~HREF
                 <<   *d.constraint
diff --git a/brep/package.cxx b/brep/package.cxx
index 3c65ed8..853d484 100644
--- a/brep/package.cxx
+++ b/brep/package.cxx
@@ -77,7 +77,7 @@ namespace brep
   weighted_text package::
   search_text () const
   {
-    if (internal_repository == nullptr)
+    if (!internal ())
       return weighted_text ();
 
     // Derive keywords from the basic package information: name,
diff --git a/brep/page.cxx b/brep/page.cxx
index deee055..481825b 100644
--- a/brep/page.cxx
+++ b/brep/page.cxx
@@ -284,7 +284,7 @@ namespace brep
 
           shared_ptr<package> p (da.package.load ());
 
-          if (p->internal_repository != nullptr)
+          if (p->internal ())
             s << A << HREF << "/go/" << mime_url_encode (n) << ~HREF << n << ~A;
           else
             // @@ Refer to package repository URL when supported in repository
-- 
cgit v1.1