changeset 16754:55fd5be68a52

Truffle-DSL: minor adaptions to the processor AST.
author Christian Humer <christian.humer@gmail.com>
date Mon, 11 Aug 2014 15:53:05 +0200
parents f78eafd5ba9e
children bd28da642eea
files graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeElement.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTree.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTreeBuilder.java graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTypeElement.java
diffstat 4 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeElement.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeElement.java	Mon Aug 11 15:53:05 2014 +0200
@@ -146,7 +146,7 @@
         getAnnotationMirrors().remove(annotationMirror);
     }
 
-    void setEnclosingElement(Element parent) {
+    protected void setEnclosingElement(Element parent) {
         this.enclosingElement = parent;
     }
 
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTree.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTree.java	Mon Aug 11 15:53:05 2014 +0200
@@ -29,7 +29,7 @@
 
     private final CodeTreeKind kind;
 
-    private final TypeMirror type;
+    private TypeMirror type;
     private final String string;
 
     public CodeTree(CodeTreeKind kind, TypeMirror type, String string) {
@@ -54,6 +54,10 @@
         s.visitTree(this, p);
     }
 
+    public void setType(TypeMirror type) {
+        this.type = type;
+    }
+
     @Override
     public TypeMirror asType() {
         return type;
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTreeBuilder.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTreeBuilder.java	Mon Aug 11 15:53:05 2014 +0200
@@ -651,6 +651,10 @@
         return found;
     }
 
+    public CodeTreeBuilder returnNull() {
+        return startReturn().string("null").end();
+    }
+
     public CodeTreeBuilder returnTrue() {
         return startReturn().string("true").end();
     }
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTypeElement.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/ast/CodeTypeElement.java	Mon Aug 11 15:53:05 2014 +0200
@@ -130,7 +130,7 @@
     }
 
     @Override
-    void setEnclosingElement(Element element) {
+    protected void setEnclosingElement(Element element) {
         super.setEnclosingElement(element);
 
         // update qualified name on container change