diff --git a/shared/tools/bgfover b/shared/tools/bgfover index b4e7aa0a..0c5193e9 100755 --- a/shared/tools/bgfover +++ b/shared/tools/bgfover @@ -7,5 +7,5 @@ cd ../.. SLPS=${PWD} cd ${LOCAL1} -python ${SLPS}/topics/presentation/metrics/bgf_overview.py $1 $2 +python ${SLPS}/topics/presentation/metrics/bgf_overview.py $1 $2 $3 rm -f TMP-res diff --git a/topics/extraction/html2bgf/html2bgf.py b/topics/extraction/html2bgf/html2bgf.py index b4f74171..477b3aa3 100755 --- a/topics/extraction/html2bgf/html2bgf.py +++ b/topics/extraction/html2bgf/html2bgf.py @@ -140,7 +140,9 @@ def addProduction(name,choices,oneof): print 'UNK', if choices[s][0][i].isalnum(): print 'ALNUM' - elif choices[s][0][i] in ('[',']','{','}','(',')','?????','|'): + elif choices[s][0][i] == '|': + print 'BNBAR' + elif choices[s][0][i] in ('[',']','{','}','(',')','?????'): print 'METAS' else: print 'WEIRD' diff --git a/topics/presentation/metrics/bgf_overview.py b/topics/presentation/metrics/bgf_overview.py index 8a7da667..5c21fd00 100755 --- a/topics/presentation/metrics/bgf_overview.py +++ b/topics/presentation/metrics/bgf_overview.py @@ -22,19 +22,15 @@ def runxpath(filename,xpathexpr): return res if __name__ == "__main__": - if len(sys.argv) != 3: + if len(sys.argv) != 4: print 'This tool generates an overview of a bunch of BGF sources and targets.' print 'Usage:' - print ' bgfover ' + print ' bgfover ' sys.exit(1) lcf = ET.parse(sys.argv[1]) - for x in lcf.findall('/source'): + for x in lcf.findall(sys.argv[3]): name = x.findtext('name') names.append(name) - srclen = len(names) - for x in lcf.findall('/target'): - name = x.findtext('name') - tnames.append(name) path = sys.argv[2] if path[-1]!='/': path += '/' @@ -43,9 +39,6 @@ def runxpath(filename,xpathexpr): print '&\\textbf{productions}&\\textbf{nonterminals}&\\textbf{nonterminals}&\\textbf{nonterminals}\\\\\\hline\\hline' for x in names: print '\\emph{'+x+'}&'+runxpath(path+x+'.bgf',productions)+'&'+runxpath(path+x+'.bgf',nonterminals)+'&'+runxpath(path+x+'.bgf',top)+'&'+runxpath(path+x+'.bgf',bottom)+'\\\\\\hline' - print '\\hline' - for x in tnames: - print '\\emph{'+x+'}&'+runxpath(path+x+'.bgf',productions)+'&'+runxpath(path+x+'.bgf',nonterminals)+'&'+runxpath(path+x+'.bgf',top)+'&'+runxpath(path+x+'.bgf',bottom)+'\\\\\\hline' print '\\end{tabular}' sys.exit(0) diff --git a/topics/presentation/metrics/extractor_overview.py b/topics/presentation/metrics/extractor_overview.py index ab1a5495..9be5ffcb 100755 --- a/topics/presentation/metrics/extractor_overview.py +++ b/topics/presentation/metrics/extractor_overview.py @@ -161,7 +161,7 @@ def extractall(path): sorted.sort() for src in sorted: texwrite(tbl,'&\\textbf{'+src+'}') - texwrite(tbl,'&\\textbf{Total}\\\\\\hline') + texwrite(tbl,'&\\textbf{Total}\\\\\\hline\\hline') for i in range(0,len(o_txt)): texwrite(tbl,o_txt[i]) total = 'expr 0'