Skip to content

Commit 8ccb0ac

Browse files
sfomelsfomel
committed
cleanup
1 parent eb5a95a commit 8ccb0ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+13484
-62
lines changed

‎framework/rsf/doc.py‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ def man(self,dir,usedoc_max,rsfroot,name=None):
493493
month = day.strftime('%B %Y').upper()
494494
contents += '"%s" ' % month
495495
contents += 'Madagascar "Madagascar Manuals"\n'
496-
desc = '.SH NAME\n%s \- %s\n' % (name,self.desc)
496+
desc = r'.SH NAME\n%s \- %s\n' % (name,self.desc)
497497
contents = contents + desc
498498
if self.snps:
499499
contents = contents + '.SH SYNOPSIS\n.B %s\n' % self.snps
@@ -802,93 +802,93 @@ def spec(dir,name='extend.spec'):
802802
comment['python'] = re.compile(r'[^\'\"]*([\'\"]+)(?P<comment>[^\'\"].+?)\1',
803803
re.DOTALL)
804804
param['python'] = re.compile(r'par\.(?P<type>bool|int|float|string)'
805-
'\s*\(\s*[\"\'](?P<name>\w+)[\"\']\s*'
806-
'(?:\,\s*(?P<default>[^\)]+))?\)'
807-
'(?:\s*\#\s*(?P<range>[\[][^\]]+[\]])?\s*'
808-
'(?P<desc>[^#\n]+\S))?')
805+
r'\s*\(\s*[\"\'](?P<name>\w+)[\"\']\s*'
806+
r'(?:\,\s*(?P<default>[^\)]+))?\)'
807+
r'(?:\s*\#\s*(?P<range>[\[][^\]]+[\]])?\s*'
808+
r'(?P<desc>[^#\n]+\S))?')
809809
synopsis['python'] = re.compile(r'\s*\#\s*Takes\s*\:\s*'
810-
'((?:[^\n]|\n\#[^\n])+)((?:.|\n)*)$')
810+
r'((?:[^\n]|\n\#[^\n])+)((?:.|\n)*)$')
811811
inpout['python'] = re.compile(r'\s*(?P<name>\w+)\s*=\s*'
812-
'rsf\.(?P<io>Input|Output)'
813-
'\s*\(\s*(?:[\"\'](?P<tag>\w+)[\"\'])?')
812+
r'rsf\.(?P<io>Input|Output)'
813+
r'\s*\(\s*(?:[\"\'](?P<tag>\w+)[\"\'])?')
814814
version['python'] = re.compile(r'\#\s*\$Id\:\s*(.+\S)\s*\$/')
815815
chars['python'] = r'# '
816816

817817
comment['c++'] = re.compile(r'\/\/(?P<comment>[^\n]+)\n')
818818
inpout['c++'] = re.compile(r'(?P<io>iRSF|oRSF)\s*(?P<name>\w+)'
819-
'\s*(?:\(\s*\"?(?P<tag>\w+)\"?\s*\))?')
819+
r'\s*(?:\(\s*\"?(?P<tag>\w+)\"?\s*\))?')
820820
param['c++'] = re.compile(r'par.get\s*\(\s*[\"\'](?P<name>\w+)[\"\']\s*'
821-
'(?:\,\s*(?P<var>[^\)\,]+))'
822-
'(?:\,\s*(?P<default>[^\)]+))?\)'
823-
'(?:\s*\;\s*\/\/\s*(?P<range>[\[][^\]]+[\]])?\s*'
824-
'(?P<desc>[^\n]+\S))?')
821+
r'(?:\,\s*(?P<var>[^\)\,]+))'
822+
r'(?:\,\s*(?P<default>[^\)]+))?\)'
823+
r'(?:\s*\;\s*\/\/\s*(?P<range>[\[][^\]]+[\]])?\s*'
824+
r'(?P<desc>[^\n]+\S))?')
825825
version['c++'] = re.compile(r'\/\/\s*\$Id\:\s*(.+\S)\s*\$/')
826826
chars['c++'] = r'/ '
827827

828828
comment['f90'] = re.compile(r'\!(?P<comment>[^\n]+(?:\n\![^\n]+)+)\n')
829829
param['f90'] = re.compile(r'from_par\s*\(\s*\"(?P<name>\w+)\"\s*\,'
830-
'\s*(?P<var>[\w\_]+)\s*'
831-
'(?:\,\s*(?P<default>[^\)]+))?\)'
832-
'(?:\s*\!\s*(?P<range>[\[][^\]]+[\]])?\s*'
833-
'(?P<desc>[^!\n]+\S))?')
830+
r'\s*(?P<var>[\w\_]+)\s*'
831+
r'(?:\,\s*(?P<default>[^\)]+))?\)'
832+
r'(?:\s*\!\s*(?P<range>[\[][^\]]+[\]])?\s*'
833+
r'(?P<desc>[^!\n]+\S))?')
834834
synopsis['f90'] = re.compile(r'\s*\!\s*Takes\s*\:\s*'
835-
'((?:[^\n]|\n\![^\n])+)((?:.|\n)*)$')
835+
r'((?:[^\n]|\n\![^\n])+)((?:.|\n)*)$')
836836
inpout['f90'] = re.compile(r'\s*(?P<name>\w+)\s*=\s*'
837-
'rsf_(?P<io>input|output)'
838-
'\s*\(\s*(?:\"(?P<tag>\w+)\")?')
837+
r'rsf_(?P<io>input|output)'
838+
r'\s*\(\s*(?:\"(?P<tag>\w+)\")?')
839839
version['f90'] = re.compile(r'\!\s*\$Id\:\s*(.+\S)\s*\$/')
840840
chars['f90'] = r'! '
841841

842842
comment['c'] = re.compile(r'\/\*(?P<comment>(?:[^*]+|\*[^/])+)\*\/')
843843
param['c'] = re.compile(r'(?:if\s*\(\!)?\s*sf_get'
844-
'(?P<type>bool|largeint|int|float|double)'
845-
'\s*\(\s*\"(?P<name>\w+)\"\s*\,'
846-
'\s*\&(?P<var>[\w\_\[\]\.\+\-\>]+)\s*[\)]\s*[\)]?\s*'
847-
'(?:[\{]|' # either \{ or
848-
'(?:(?P=var)\s*\=\s*(?P<default>[^\;]+)|'
849-
'sf_[^\;]+)?' # or sf_error
850-
'[\;])\s*' # ending with ;
851-
'(?:\/\*\s*(?P<range>[\[][^\]]+[\]])?\s*'
852-
'(?P<desc>(?:[^*]|\*[^/])+)\*\/)?') # comment
844+
r'(?P<type>bool|largeint|int|float|double)'
845+
r'\s*\(\s*\"(?P<name>\w+)\"\s*\,'
846+
r'\s*\&(?P<var>[\w\_\[\]\.\+\-\>]+)\s*[\)]\s*[\)]?\s*'
847+
r'(?:[\{]|' # either \{ or
848+
r'(?:(?P=var)\s*\=\s*(?P<default>[^\;]+)|'
849+
r'sf_[^\;]+)?' # or sf_error
850+
r'[\;])\s*' # ending with ;
851+
r'(?:\/\*\s*(?P<range>[\[][^\]]+[\]])?\s*'
852+
r'(?P<desc>(?:[^*]|\*[^/])+)\*\/)?') # comment
853853
params['c'] = re.compile(r'sf_get(?P<type>bools|ints|floats|strings)'
854-
'\s*\(\s*\"(?P<name>\w+)\"\s*\,'
855-
'\s*(?P<var>[\w\_\[\]\.]+)\s*\,'
856-
'\s*(?P<size>[\w\_\-\+]+)\s*\)\s*'
857-
'[^\;\{]*[\;\{]\s*' # ending with ; or {
858-
'(?:\/\*\s*(?P<range>[\[][^\]]+[\]])?\s*'
859-
'(?P<desc>(?:[^*]|\*[^/])+)\*\/)?') # comment
854+
r'\s*\(\s*\"(?P<name>\w+)\"\s*\,'
855+
r'\s*(?P<var>[\w\_\[\]\.]+)\s*\,'
856+
r'\s*(?P<size>[\w\_\-\+]+)\s*\)\s*'
857+
r'[^\;\{]*[\;\{]\s*' # ending with ; or {
858+
r'(?:\/\*\s*(?P<range>[\[][^\]]+[\]])?\s*'
859+
r'(?P<desc>(?:[^*]|\*[^/])+)\*\/)?') # comment
860860
param2['c'] = re.compile(r'sf_get(?P<type>bool|largeint|int|float|string)\s*'
861-
'\((?:[^/]|/[^\*])+\/\*\(\s*(?P<name>[\w\#]+)'
862-
'(?:=(?P<default>\S+))?'
863-
'\s*(?P<desc>[^\)]+)\)\*\/')
861+
r'\((?:[^/]|/[^\*])+\/\*\(\s*(?P<name>[\w\#]+)'
862+
r'(?:=(?P<default>\S+))?'
863+
r'\s*(?P<desc>[^\)]+)\)\*\/')
864864
params2['c'] = re.compile(r'sf_get(?P<type>bools|ints|floats|strings)'
865-
'\s*\([^\,]+\,[^\,]+\,'
866-
'\s*(?P<size>[\w\_]+)\s*\)[^/]+'
867-
'\/\*\(\s*(?P<name>[\w\#]+)'
868-
'(?:=(?P<default>\S+))?'
869-
'\s*(?P<desc>(?:[^\)]|\)[^\*])+)\)\*\/')
865+
r'\s*\([^\,]+\,[^\,]+\,'
866+
r'\s*(?P<size>[\w\_]+)\s*\)[^/]+'
867+
r'\/\*\(\s*(?P<name>[\w\#]+)'
868+
r'(?:=(?P<default>\S+))?'
869+
r'\s*(?P<desc>(?:[^\)]|\)[^\*])+)\)\*\/')
870870
stringpar['c'] = re.compile(r'sf_getstring\s*\(\s*\"(?P<name>\w+)\"'
871-
'[^\;\{]*[\;\{]\s*(?:\/\*'
872-
'\s*(?P<desc>(?:[^*]|\*[^/])+)\*\/)?')
871+
r'[^\;\{]*[\;\{]\s*(?:\/\*'
872+
r'\s*(?P<desc>(?:[^*]|\*[^/])+)\*\/)?')
873873
synopsis['c'] = re.compile(r'\s*Takes\s*\:\s*((?:[^\n]|[\n][^\n])+)'
874874
'((?:.|\n)*)$')
875875
inpout['c'] = re.compile(r'\s*(?P<name>\w+)\s*=\s*'
876-
'sf_(?P<io>input|output)'
877-
'\s*\(\s*\"(?P<tag>\w+)\"')
876+
r'sf_(?P<io>input|output)'
877+
r'\s*\(\s*\"(?P<tag>\w+)\"')
878878
version['c'] = re.compile(r'\/\*\s*\$Id\:\s*(.+\S)\s*\$\s*\*\/')
879879
chars['c'] = ' '
880880

881881
comment['chpl'] = re.compile(r'\/\/(?P<comment>[^\n]+)\n')
882882
inpout['chpl'] = re.compile(r'\s*var\s+(?P<name>\w+)\s*\:\s*'
883-
'(?:RSF\.)?sf_file\s*=\s*'
884-
'(?:RSF\.)?sf_(?P<io>input|output)'
885-
'\s*\(\s*\"?(?P<tag>\w+)\"?\s*\)')
883+
r'(?:RSF\.)?sf_file\s*=\s*'
884+
r'(?:RSF\.)?sf_(?P<io>input|output)'
885+
r'\s*\(\s*\"?(?P<tag>\w+)\"?\s*\)')
886886
param['chpl'] = re.compile(r'\s*config\s+(?:const|var)\s+(?P<name>\w+)'
887-
'\s*\:\s*(?P<type>bool|int|uint|real|imag|'
888-
'complex|string)'
889-
'(?:\([0-9]+\))?\s*\=\s*\"?'
890-
'(?P<default>[^\;\"]+)\"?\s*\;'
891-
'\s*\/\/(?P<desc>[^\n]+)')
887+
r'\s*\:\s*(?P<type>bool|int|uint|real|imag|'
888+
r'complex|string)'
889+
r'(?:\([0-9]+\))?\s*\=\s*\"?'
890+
r'(?P<default>[^\;\"]+)\"?\s*\;'
891+
r'\s*\/\/(?P<desc>[^\n]+)')
892892
version['chpl'] = re.compile(r'\/\/\s*\$Id\:\s*(.+\S)\s*\$/')
893893

894894

@@ -903,12 +903,12 @@ def getprog(file,out,lang = 'c',rsfprefix = 'sf',rsfsuffix='rsf',
903903
source = file
904904
name = rsfprefix + name
905905
if lang[:2] == 'py':
906-
name = re.sub('\.py$','',name)
906+
name = re.sub(r'\.py$','',name)
907907
elif lang[0] =='f':
908-
name = re.sub('\.f\d*$','',name)
908+
name = re.sub(r'\.f\d*$','',name)
909909
else:
910-
name = re.sub('\.c(c|u|hpl)?$','',name)
911-
cname = re.sub('\-','',name)
910+
name = re.sub(r'\.c(c|u|hpl)?$','',name)
911+
cname = re.sub(r'\-','',name)
912912
src = open(file,"r") # open source
913913
text = ''.join(src.readlines())
914914
src.close()
@@ -920,7 +920,7 @@ def getprog(file,out,lang = 'c',rsfprefix = 'sf',rsfsuffix='rsf',
920920
else:
921921
desc = None
922922
prog = rsfprog(name,source,desc)
923-
source = re.sub('^[^\/]*\/','',source)
923+
source = re.sub(r'^[^\/]*\/','',source)
924924
out.write("%s = rsf.doc.rsfprog('%s','%s','''%s''')\n" %
925925
(cname,name,source,desc))
926926
files = inpout[lang].findall(text)

0 commit comments

Comments
 (0)