Mercurial > hg > truffle
changeset 13620:fa56f5a49270
improved format checking and error reporting when parsing a projects file
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 13 Jan 2014 21:40:47 +0100 |
| parents | 5a076e52220a |
| children | 850c437c26d3 |
| files | mxtool/mx.py |
| diffstat | 1 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Mon Jan 13 19:18:43 2014 +0100 +++ b/mxtool/mx.py Mon Jan 13 21:40:47 2014 +0100 @@ -701,7 +701,13 @@ with open(projectsFile) as f: prefix = '' + lineNum = 0 + + def error(message): + abort(projectsFile + ':' + str(lineNum) + ': ' + message) + for line in f: + lineNum = lineNum + 1 line = line.strip() if line.endswith('\\'): prefix = prefix + line[:-1] @@ -710,6 +716,8 @@ line = prefix + line prefix = '' if len(line) != 0 and line[0] != '#': + if '=' not in line: + error('non-comment line does not contain an "=" character') key, value = line.split('=', 1) parts = key.split('@') @@ -717,18 +725,18 @@ if len(parts) == 1: if parts[0] == 'suite': if self.name != value: - abort('suite name in project file does not match ' + _suitename(self.mxDir)) + error('suite name in project file does not match ' + _suitename(self.mxDir)) elif parts[0] == 'mxversion': try: self.requiredMxVersion = VersionSpec(value) except AssertionError as ae: - abort('Exception while parsing "mxversion" in project file: ' + str(ae)) + error('Exception while parsing "mxversion" in project file: ' + str(ae)) else: - abort('Single part property must be "suite": ' + key) + error('Single part property must be "suite": ' + key) continue if len(parts) != 3: - abort('Property name does not have 3 parts separated by "@": ' + key) + error('Property name does not have 3 parts separated by "@": ' + key) kind, name, attr = parts if kind == 'project': m = projsMap @@ -737,7 +745,7 @@ elif kind == 'distribution': m = distsMap else: - abort('Property name does not start with "project@", "library@" or "distribution@": ' + key) + error('Property name does not start with "project@", "library@" or "distribution@": ' + key) attrs = m.get(name) if attrs is None: @@ -768,7 +776,7 @@ p.checkstyleProj = attrs.pop('checkstyle', name) p.native = attrs.pop('native', '') == 'true' if not p.native and p.javaCompliance is None: - abort('javaCompliance property required for non-native project ' + name) + error('javaCompliance property required for non-native project ' + name) if len(ap) > 0: p._declaredAnnotationProcessors = ap p.__dict__.update(attrs)