Mercurial > hg > truffle

annotate mx/outputparser.py @ 4219:47f7d91d34cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix javac build issues with classpath WIP for benchmarks
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Wed, 04 Jan 2012 22:54:27 +0100
parents a2caa019ba3a
children 339cf8d4904d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
1 import mx
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
2 import commands
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
3
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
4 class OutputParser:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
5
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
6 def __init__(self, nonZeroIsFatal=True):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
7 self.matchers = []
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
8 self.nonZeroIsFatal = nonZeroIsFatal
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
9
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
10 def addMatcher(self, matcher):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
11 self.matchers.append(matcher)
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
12
4219
47f7d91d34cf Fix javac build issues with classpath
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4215
diff changeset
13 def parse(self, vm, cmd, cwd=None, vmbuild=None):
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
14 ret = [{}]
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
15
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
16 def parseLine(line):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
17 anyMatch = False
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
18 for matcher in self.matchers:
4215
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments.
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4151
diff changeset
19 parsed = matcher.parse(line.strip())
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
20 if parsed:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
21 anyMatch = True
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
22 if matcher.startNewLine and len(ret[0]) > 0:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
23 ret.append({})
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
24 ret[len(ret)-1].update(parsed)
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
25 if anyMatch :
4215
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments.
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4151
diff changeset
26 mx.log('>' + line.rstrip())
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
27 else :
4215
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments.
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4151
diff changeset
28 mx.log( line.rstrip())
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
29
4219
47f7d91d34cf Fix javac build issues with classpath
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4215
diff changeset
30 retcode = commands.vm(cmd, vm, nonZeroIsFatal=self.nonZeroIsFatal, out=parseLine, err=parseLine, cwd=cwd, vmbuild=vmbuild)
4215
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments.
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4151
diff changeset
31 return {'parsed' : ret, 'retcode' : retcode}
4151
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
32
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
33 class Matcher:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
34
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
35 def __init__(self, regex, valuesToParse, startNewLine=False):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
36 assert isinstance(valuesToParse, dict)
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
37 self.regex = regex
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
38 self.valuesToParse = valuesToParse
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
39 self.startNewLine = startNewLine
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
40
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
41 def parse(self, line):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
42 match = self.regex.search(line)
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
43 if not match:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
44 return False
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
45 ret = {}
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
46 for key, value in self.valuesToParse.items():
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
47 ret[self.parsestr(match, key)] = self.parsestr(match, value)
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
48 return ret
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
49
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
50 def parsestr(self, match, key):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
51 if isinstance(key, tuple):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
52 if len(key) != 2:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
53 raise Exception('Tuple arguments must have a lenght of 2')
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
54 tup1, tup2 = key
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
55 # check if key is a function
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
56 if hasattr(tup1, '__call__'):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
57 return tup1(self.parsestr(match, tup2))
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
58 elif hasattr(tup2, '__call__'):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
59 return tup2(self.parsestr(match, tup1))
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
60 else:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
61 raise Exception('Tuple must contain a function pointer')
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
62 elif key.startswith('const:'):
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
63 return key.split(':')[1]
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
64 else:
cb22fcb2e2fc missing file
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents:
diff changeset
65 return match.group(key)