Mercurial > hg > truffle

changeset 16907:09d99d3c0c95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle-DSL: made guard parsing more robust.
author Christian Humer <christian.humer@gmail.com>
date Sat, 23 Aug 2014 19:31:09 +0200
parents 8eca9a00aaba
children d3f282a9e287
files graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java	Sat Aug 23 19:31:01 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/parser/NodeParser.java	Sat Aug 23 19:31:09 2014 +0200
@@ -949,10 +949,8 @@
 
         GuardParser parser = new GuardParser(context, node, source, expression);
         List<GuardData> matchingGuards = parser.parse(availableGuards);
-        if (!matchingGuards.isEmpty()) {
-            GuardData guard = matchingGuards.get(0);
-            // use the shared instance of the guard data
-            expression.setResolvedGuard(guard);
+        if (!matchingGuards.isEmpty() && matchingGuards.get(0) != null) {
+            expression.setResolvedGuard(matchingGuards.get(0));
         } else {
             MethodSpec spec = parser.createSpecification(source.getMethod(), source.getMarkerAnnotation());
             spec.applyTypeDefinitions("types");