diff options
| -rw-r--r-- | src/parser.js | 5 | ||||
| -rw-r--r-- | src/utility.js | 4 | ||||
| -rw-r--r-- | tests/runner.py | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/parser.js b/src/parser.js index 8997d3c4..7f25d2e5 100644 --- a/src/parser.js +++ b/src/parser.js @@ -226,9 +226,10 @@ function parseParamTokens(params) { function parseGetElementPtr(segment) { segment = segment.slice(0); - if (segment[1].text === 'noalias') { + while (['noalias', 'sret', 'nocapture', 'nest', 'zeroext', 'signext'].indexOf(segment[1].text) != -1) { segment.splice(1, 1); } + assertTrue(['inreg', 'byval'].indexOf(segment[1].text) == -1); var ret = { intertype: 'getelementptr', type: segment[0], @@ -471,7 +472,7 @@ function intertyper(data) { selectItem: function(item) { return item.tokens && item.tokens.length >= 3 && item.indent === 0 && item.tokens[1].text == '=' }, processItem: function(item) { if (item.tokens[2].text == 'type') { - dprint('linenum: ' + item.lineNum + ':' + dump(item)); + //dprint('type/const linenum: ' + item.lineNum + ':' + dump(item)); var fields = []; if (item.tokens[3].text != 'opaque') { if (item.tokens[3].type == '<') // type <{ i8 }> XXX - check spec diff --git a/src/utility.js b/src/utility.js index f95e81f1..94a2132a 100644 --- a/src/utility.js +++ b/src/utility.js @@ -1,7 +1,7 @@ function dump(item) { try { - return JSON.stringify(item); + return JSON.stringify(item).substr(0,200); } catch(e) { var ret = []; for (var i in item) { @@ -12,7 +12,7 @@ function dump(item) { ret.push(i + ': [?]'); } } - return ret.join(', '); + return ret.join(', ').substr(0,200); } } diff --git a/tests/runner.py b/tests/runner.py index b27d9714..82109a34 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -70,7 +70,7 @@ class T(unittest.TestCase): if DEBUG: print output cwd = os.getcwd() os.chdir(path_from_root(['src'])) - output = timeout_run(Popen([PARSER_ENGINE] + PARSER_OPTS + [JS_COMPILER], stdin=open(filename + '.o.llvm', 'r'), stdout=open(filename + '.o.js', 'w'), stderr=STDOUT), 20, 'Parser') + output = timeout_run(Popen([PARSER_ENGINE] + PARSER_OPTS + [JS_COMPILER], stdin=open(filename + '.o.llvm', 'r'), stdout=open(filename + '.o.js', 'w'), stderr=STDOUT), 200, 'Parser') os.chdir(cwd) # return if DEBUG: print output |