Added f15 extensions and tidied up a bit of logic in sourceform

Fortran-FOSS-Programmers · Jul 2, 2015 · 0ca886a · 0ca886a
1 parent 42c822d
commit 0ca886a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/ford/__init__.py b/ford/__init__.py
@@ -105,8 +105,8 @@ def main():
                u'media_dir',u'favicon',u'warn',u'extra_vartypes',u'page_dir',
                u'source',u'exclude_dir',u'macro',u'preprocess']
     defaults = {u'project_dir':       u'./src',
-                u'extensions':        [u"f90",u"f95",u"f03",u"f08",u"F90",
-                                       u"F95",u"F03",u"F08"],
+                u'extensions':        [u"f90",u"f95",u"f03",u"f08",u"f15",u"F90",
+                                       u"F95",u"F03",u"F08",u"F15"],
                 u'output_dir':        u'./doc',
                 u'project':           u'Fortran Program',
                 u'project_url':       u'',

diff --git a/ford/sourceform.py b/ford/sourceform.py
@@ -122,7 +122,7 @@ def get_url(self):
                                               FortranModule] ) ):
             outstr = quote(outstr.format(self.base_url,self.obj,self.name.lower().replace('/','slash'),''))
         elif ( (type(self) == FortranBoundProcedure) ):
-            outstr = quote(outstr.format(self.base_url,self.parobj,self.parent.name.lower().replace('/','slash'),self.name.lower().replace('/','slash')))
+            outstr = quote(outstr.format(self.base_url,self.parobj,self.parent.name.lower().replace('/','slash'),'#'+self.name.lower().replace('/','slash')))
         else:
             outstr = None
         return outstr
@@ -133,11 +133,10 @@ def __str__(self):
         url = self.get_url()
         if url:
             outstr = outstr.format(url,self.name)
+        elif self.name:
+            outstr = self.name
         else:
-            if self.name:
-                outstr = self.name
-            else:
-                outstr = ''
+            outstr = ''
         return outstr
 
     def __lt__(self,other):