# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1407790286 25200
# Node ID a24beb9c999373d9ac77bff1661838bac3aae83e
# Parent  8c606e8053b8d1ef6e30b673f2e47c78dcdb2854
SL/instrumentation:  minor cleanups in sl.test.instrument

diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLCheckVariableEqualityInstrument.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLCheckVariableEqualityInstrument.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLCheckVariableEqualityInstrument.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 /**
  * This sample instrument provides an example of a naive way to check if two numbers in SL are
  * equivalent using their variable names. This instrument is designed to be attached to an
- * {@link SLReturnNode}, but provides no guards against this.
+ * {@link SLReturnNode}, but provides no guards ensuring this.
  */
 public class SLCheckVariableEqualityInstrument extends Instrument {
 
diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestNodeProber.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestNodeProber.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestNodeProber.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,11 +65,11 @@
         SLStatementWrapper wrapper = null;
         if (node instanceof SLStatementWrapper) {
             wrapper = (SLStatementWrapper) node;
-            tagStatementNode(wrapper);
+            wrapper.tagAs(STATEMENT);
             return wrapper;
         } else if (node instanceof SLReturnNode) {
             wrapper = new SLStatementWrapper(slContext, node);
-            tagStatementNode(wrapper);
+            wrapper.tagAs(STATEMENT);
             return wrapper;
         }
         return node;
@@ -94,26 +94,14 @@
         SLExpressionWrapper wrapper = null;
         if (node instanceof SLExpressionWrapper) {
             wrapper = (SLExpressionWrapper) node;
-            tagAssignmentNode(wrapper);
+            wrapper.tagAs(ASSIGNMENT);
             return wrapper;
         } else if (node instanceof SLWriteLocalVariableNode) {
             wrapper = new SLExpressionWrapper(slContext, node);
-            tagAssignmentNode(wrapper);
+            wrapper.tagAs(ASSIGNMENT);
             return wrapper;
         }
         return node;
     }
 
-    private static void tagAssignmentNode(SLExpressionWrapper wrapper) {
-        if (!wrapper.isTaggedAs(ASSIGNMENT)) {
-            wrapper.tagAs(ASSIGNMENT);
-        }
-    }
-
-    private static void tagStatementNode(SLStatementWrapper wrapper) {
-        if (!wrapper.isTaggedAs(STATEMENT)) {
-            wrapper.tagAs(STATEMENT);
-        }
-    }
-
 }
\ No newline at end of file
diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestRunner.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestRunner.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestRunner.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestSuite.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestSuite.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLInstrumentTestSuite.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLPrintAssigmentValueInstrument.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLPrintAssigmentValueInstrument.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLPrintAssigmentValueInstrument.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 8c606e8053b8 -r a24beb9c9993 graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLSimpleInstrumentTestSuite.java
--- a/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLSimpleInstrumentTestSuite.java	Mon Aug 11 10:35:38 2014 -0700
+++ b/graal/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/instrument/SLSimpleInstrumentTestSuite.java	Mon Aug 11 13:51:26 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it