Mercurial > hg > truffle

changeset 21941:0a00a5bd7c70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Need to expose also TRUFFLE-SL as Graal tests against that language
author Jaroslav Tulach <jaroslav.tulach@oracle.com>
date Tue, 16 Jun 2015 12:54:55 +0200
parents 3ecd0f489818
children dd4050aadaf8
files graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java mx/mx_graal.py mx/suite.py
diffstat 3 files changed, 42 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java	Mon Jun 15 17:03:28 2015 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java	Tue Jun 16 12:54:55 2015 +0200
@@ -49,24 +49,27 @@
 
     @TruffleBoundary
     private static String createStackTrace() {
-        StringBuilder str = new StringBuilder();
+        final StringBuilder str = new StringBuilder();
 
-        Truffle.getRuntime().iterateFrames(frameInstance -> {
-            CallTarget callTarget = frameInstance.getCallTarget();
-            Frame frame = frameInstance.getFrame(FrameAccess.READ_ONLY, true);
-            RootNode rn = ((RootCallTarget) callTarget).getRootNode();
-            if (rn.getClass().getName().contains("SLFunctionForeignAccess")) {
-                return 1;
+        Truffle.getRuntime().iterateFrames(new FrameInstanceVisitor<Integer>() {
+            @Override
+            public Integer visitFrame(FrameInstance frameInstance) {
+                CallTarget callTarget = frameInstance.getCallTarget();
+                Frame frame = frameInstance.getFrame(FrameAccess.READ_ONLY, true);
+                RootNode rn = ((RootCallTarget) callTarget).getRootNode();
+                if (rn.getClass().getName().contains("SLFunctionForeignAccess")) {
+                    return 1;
+                }
+                if (str.length() > 0) {
+                    str.append(System.getProperty("line.separator"));
+                }
+                str.append("Frame: ").append(rn.toString());
+                FrameDescriptor frameDescriptor = frame.getFrameDescriptor();
+                for (FrameSlot s : frameDescriptor.getSlots()) {
+                    str.append(", ").append(s.getIdentifier()).append("=").append(frame.getValue(s));
+                }
+                return null;
             }
-            if (str.length() > 0) {
-                str.append(System.getProperty("line.separator"));
-            }
-            str.append("Frame: ").append(rn.toString());
-            FrameDescriptor frameDescriptor = frame.getFrameDescriptor();
-            frameDescriptor.getSlots().stream().forEach((s) -> {
-                str.append(", ").append(s.getIdentifier()).append("=").append(frame.getValue(s));
-            });
-            return null;
         });
         return str.toString();
     }
--- a/mx/mx_graal.py	Mon Jun 15 17:03:28 2015 +0200
+++ b/mx/mx_graal.py	Tue Jun 16 12:54:55 2015 +0200
@@ -1734,7 +1734,7 @@
 
 def maven_install_truffle(args):
     """install Truffle into your local Maven repository"""
-    for name in ['TRUFFLE', 'TRUFFLE-TCK', 'TRUFFLE-DSL-PROCESSOR']:
+    for name in ['TRUFFLE', 'TRUFFLE-TCK', 'TRUFFLE-DSL-PROCESSOR', 'TRUFFLE-SL']:
         mx.archive(["@" + name])
         path = mx._dists[name].path
         mx.run(['mvn', 'install:install-file', '-DgroupId=com.oracle', '-DartifactId=' + name.lower(), '-Dversion=' + graal_version('SNAPSHOT'), '-Dpackaging=jar', '-Dfile=' + path])
--- a/mx/suite.py	Mon Jun 15 17:03:28 2015 +0200
+++ b/mx/suite.py	Tue Jun 16 12:54:55 2015 +0200
@@ -276,7 +276,7 @@
           "JUNIT"
           ],
       "checkstyle" : "com.oracle.truffle.api",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "workingSets" : "Truffle,Tools",
     },
 
@@ -295,7 +295,7 @@
       "dependencies" : ["com.oracle.truffle.tools.debug.engine",
                         "JLINE"],
       "checkstyle" : "com.oracle.truffle.api",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "workingSets" : "Truffle,Tools",
     },
 
@@ -309,7 +309,7 @@
         "FINDBUGS"
       ],
       "checkstyle" : "com.oracle.truffle.dsl.processor",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "annotationProcessors" : ["com.oracle.truffle.dsl.processor"],
       "workingSets" : "Truffle,SimpleLanguage",
     },
@@ -322,7 +322,7 @@
         "com.oracle.truffle.sl"
       ],
       "checkstyle" : "com.oracle.truffle.dsl.processor",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "workingSets" : "Truffle,SimpleLanguage,Test",
     },
 
@@ -331,7 +331,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.truffle.tools.debug.shell"],
       "checkstyle" : "com.oracle.truffle.api",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "workingSets" : "Truffle,SimpleLanguage,Tools",
     },
   },
@@ -372,6 +372,22 @@
       "javaCompliance" : "1.7",
       "dependencies" : ["com.oracle.truffle.dsl.processor"],
       "distDependencies" : ["TRUFFLE"],
-    }
+    },
+
+    "TRUFFLE-SL" : {
+      "path" : "build/truffle-sl.jar",
+      "subDir" : "graal",
+      "sourcesPath" : "build/truffle-sl.src.zip",
+      "javaCompliance" : "1.7",
+      "dependencies" : [
+        "com.oracle.truffle.sl",
+        "com.oracle.truffle.sl.test"
+      ],
+      "distDependencies" : [
+          "TRUFFLE",
+          "TRUFFLE-TCK",
+          "TRUFFLE-DSL-PROCESSOR"
+      ],
+    },
   },
 }