From 0ca886aeaeaf04f7cab09ed2a9e4a05af167c6ae Mon Sep 17 00:00:00 2001 From: Chris MacMackin Date: Wed, 1 Jul 2015 22:25:54 -0300 Subject: [PATCH] Added f15 extensions and tidied up a bit of logic in sourceform --- ford/__init__.py | 4 ++-- ford/sourceform.py | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ford/__init__.py b/ford/__init__.py index 13fe7f80..55ee2b10 100644 --- 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 index 7054b4d7..f8a2db2b 100644 --- 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):