osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add #line directives to the genertated dissector. 

Now the compiler knows where a line comes from and errors point to the .cnf or -template.[ch] file instead of the generated code.


svn path=/trunk/; revision=16654
This commit is contained in:
Luis Ontanon 2005-12-02 17:49:47 +00:00
parent 2b4785f93e
commit 976804af94
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/asn2eth.py
View File

@ -1290,7 +1290,7 @@ class EthCnf:
return '';
if (not self.fn[name][ctx]):
return '';
return self.fn[name][ctx]['text']
return '#line %u "%s"\n%s\n' % (self.fn[name][ctx]['lineno'],self.fn[name][ctx]['fn'],self.fn[name][ctx]['text']);
def add_pdu(self, par, is_new, fn, lineno):
#print "add_pdu(par=%s, %s, %d)" % (str(par), fn, lineno)
@ -1631,10 +1631,14 @@ class EthOut:
fout.write(self.fhdr(out_nm))
fout.write('/* Input file: ' + in_nm +' */\n')
fout.write('\n')
fout.write('#line 1 "%s"\n' % (in_nm))
include = re.compile(r'^\s*#\s*include\s+[<"](?P<fname>[^>"]+)[>"]', re.IGNORECASE)
cont_linenum = 0;
while (True):
cont_linenum = cont_linenum + 1;
line = fin.readline()
if (line == ''): break
ifile = None
@ -1649,12 +1653,12 @@ class EthOut:
if (ifile):
fout.write('\n')
fout.write('/*--- Included file: ' + ifile + ' ---*/\n')
fout.write('\n')
fout.write('#line 1 "' + ifile + '"\n')
finc = file(ifile, "r")
fout.write(finc.read())
fout.write('\n')
fout.write('/*--- End of included file: ' + ifile + ' ---*/\n')
fout.write('\n')
fout.write('#line %i "%s"\n' % (cont_linenum+1,in_nm) )
finc.close()
else:
fout.write(line)