# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1419892747 -3600
# Node ID ccb97347d874403fcc4b6bf969a4d596b1224881
# Parent  301fea50e42eacb1a161ad892c6f181a846294d3
SL: adapt SL to type system singleton removal.

diff -r 301fea50e42e -r ccb97347d874 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java	Mon Dec 29 23:39:03 2014 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java	Mon Dec 29 23:39:07 2014 +0100
@@ -67,27 +67,27 @@
      */
 
     public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectLong(executeGeneric(frame));
+        return SLTypesGen.expectLong(executeGeneric(frame));
     }
 
     public BigInteger executeBigInteger(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectBigInteger(executeGeneric(frame));
+        return SLTypesGen.expectBigInteger(executeGeneric(frame));
     }
 
     public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectBoolean(executeGeneric(frame));
+        return SLTypesGen.expectBoolean(executeGeneric(frame));
     }
 
     public String executeString(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectString(executeGeneric(frame));
+        return SLTypesGen.expectString(executeGeneric(frame));
     }
 
     public SLFunction executeFunction(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectSLFunction(executeGeneric(frame));
+        return SLTypesGen.expectSLFunction(executeGeneric(frame));
     }
 
     public SLNull executeNull(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectSLNull(executeGeneric(frame));
+        return SLTypesGen.expectSLNull(executeGeneric(frame));
     }
 
     @Override
diff -r 301fea50e42e -r ccb97347d874 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java	Mon Dec 29 23:39:03 2014 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLTypes.java	Mon Dec 29 23:39:07 2014 +0100
@@ -44,7 +44,7 @@
      * singleton} instance.
      */
     @TypeCheck
-    public boolean isSLNull(Object value) {
+    public static boolean isSLNull(Object value) {
         return value == SLNull.SINGLETON;
     }
 
@@ -54,7 +54,7 @@
      * because we know that there is only a {@link SLNull#SINGLETON singleton} instance.
      */
     @TypeCast
-    public SLNull asSLNull(Object value) {
+    public static SLNull asSLNull(Object value) {
         assert isSLNull(value);
         return SLNull.SINGLETON;
     }
@@ -67,7 +67,7 @@
      * {@link BigInteger} arithmetic for values that fit into a 64-bit primitive value.
      */
     @ImplicitCast
-    public BigInteger castBigInteger(long value) {
+    public static BigInteger castBigInteger(long value) {
         return BigInteger.valueOf(value);
     }
 }
diff -r 301fea50e42e -r ccb97347d874 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyCacheNode.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyCacheNode.java	Mon Dec 29 23:39:03 2014 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyCacheNode.java	Mon Dec 29 23:39:07 2014 +0100
@@ -90,7 +90,7 @@
         protected abstract Object executeObjectUnchecked(DynamicObject receiver, boolean condition);
 
         protected long executeLongUnchecked(DynamicObject receiver, boolean condition) throws UnexpectedResultException {
-            return SLTypesGen.SLTYPES.expectLong(executeObjectUnchecked(receiver, condition));
+            return SLTypesGen.expectLong(executeObjectUnchecked(receiver, condition));
         }
     }
 
@@ -185,7 +185,7 @@
 
         @Override
         public long executeLong(DynamicObject receiver) throws UnexpectedResultException {
-            return SLTypesGen.SLTYPES.expectLong(executeObject(receiver));
+            return SLTypesGen.expectLong(executeObject(receiver));
         }
     }
 }
diff -r 301fea50e42e -r ccb97347d874 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Mon Dec 29 23:39:03 2014 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Mon Dec 29 23:39:07 2014 +0100
@@ -96,22 +96,22 @@
 
     @Override
     public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectLong(executeGeneric(frame));
+        return SLTypesGen.expectLong(executeGeneric(frame));
     }
 
     @Override
     public BigInteger executeBigInteger(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectBigInteger(executeGeneric(frame));
+        return SLTypesGen.expectBigInteger(executeGeneric(frame));
     }
 
     @Override
     public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectBoolean(executeGeneric(frame));
+        return SLTypesGen.expectBoolean(executeGeneric(frame));
     }
 
     @Override
     public String executeString(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectString(executeGeneric(frame));
+        return SLTypesGen.expectString(executeGeneric(frame));
     }
 
     @Override
@@ -131,7 +131,7 @@
 
     @Override
     public SLNull executeNull(VirtualFrame frame) throws UnexpectedResultException {
-        return SLTypesGen.SLTYPES.expectSLNull(executeGeneric(frame));
+        return SLTypesGen.expectSLNull(executeGeneric(frame));
     }
 
     @Override