qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-19 07:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the mis-handling of the progs.dat line in preprogs.src

Browse source 
Gah, must have lost a line at some stage. Also, handle line number
directives.
This commit is contained in:
Bill Currie 2012-07-14 19:00:11 +09:00
parent 7444371162
commit b6125276e4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/qfcc/source/qfpreqcc
View file

@ -74,7 +74,7 @@ comment_whole = re.compile (r'((/\*.*\*/)|//.*)')
comment_start = re.compile (r'(/\*.*)') comment_start = re.compile (r'(/\*.*)')
comment_end = re.compile (r'(.*\*/)') comment_end = re.compile (r'(.*\*/)')
directive_re = re.compile ( directive_re = re.compile (
r'^\s*#\s*(define|undef|include|includelist|endlist|ifdef|ifndef|endif|else|pragma)\b' + r'^\s*#\s*(define|undef|include|includelist|endlist|ifdef|ifndef|endif|else|pragma|[0-9]+)\b' +
r'((\s*("[^"]*"|[^ \t\n\r\f\v/]+|/(?!/))+)?)' + r'((\s*("[^"]*"|[^ \t\n\r\f\v/]+|/(?!/))+)?)' +
r'((\s*("[^"]*"|[^ \t\n\r\f\v/]+|/(?!/))+)*)') r'((\s*("[^"]*"|[^ \t\n\r\f\v/]+|/(?!/))+)*)')
macro_re = re.compile (r'#([A-Za-z_][0-9A-Za-z_]*)') macro_re = re.compile (r'#([A-Za-z_][0-9A-Za-z_]*)')
@ -194,6 +194,8 @@ def do_preprogs_src ():
if directive == 'pragma': if directive == 'pragma':
if condition[-1]: if condition[-1]:
parse_pragma (arg1, margs) parse_pragma (arg1, margs)
elif directive[0] in '0123456789':
pass
elif directive == 'includelist': elif directive == 'includelist':
if condition[-1]: if condition[-1]:
fname = parse_filename (arg1) fname = parse_filename (arg1)
@ -340,9 +342,9 @@ while i < len (sys.argv):
continue continue
i = i + 1 i = i + 1
do_preprogs_src () do_preprogs_src ()
progs_dat = source_list[0]
source_list = source_list[1:]
for s in source_list: for s in source_list:
if s[0]=='#':
continue # preprocessor directive
process_source (s) process_source (s)
f = open (progs_src, "wb") f = open (progs_src, "wb")
f.write (progs_dat + '\n\n') f.write (progs_dat + '\n\n')