# whitespace
(SKIP, r'[ \t\f\r\n\v]+', False),
+ # comments
+ (SKIP, r'//[^\r\n]*', False),
+
# Alphanumeric IDs
(ID, r'[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z_][a-zA-Z0-9_]*)?', True),
sys.stdout.write('\n')
if srcFileName.endswith('.trace'):
- cmd = [options.apitrace, 'dump', '--color=never', srcFileName]
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+ cmd = [options.apitrace, 'dump', '--verbose', '--color=never', srcFileName]
+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
srcStream = p.stdout
else:
srcStream = open(srcFileName, 'rt')