diff truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java @ 22219:1c0f490984d5

Merge with f47b601edbc626dcfe8b3636933b4834c89f7779
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Wed, 16 Sep 2015 15:36:22 -0700
parents dc83cc1f94f2 3aad794eec0e
children f78c72e2e0b6
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Wed Sep 16 12:27:08 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Wed Sep 16 15:36:22 2015 -0700
@@ -36,7 +36,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.impl.DefaultCompilerOptions;
 import com.oracle.truffle.api.instrument.ASTProber;
-import com.oracle.truffle.api.instrument.Probe;
 import com.oracle.truffle.api.source.SourceSection;
 
 /**
@@ -162,7 +161,7 @@
      * stack) without prior knowledge of the language it has come from.
      *
      * Used for instance to determine the language of a <code>RootNode<code>:
-     * 
+     *
      * <pre>
      * <code>
      * rootNode.getExecutionContext().getLanguageShortName();
@@ -188,9 +187,10 @@
     }
 
     /**
-     * Apply all registered instances of {@link ASTProber} to the AST, if any, held by this root
-     * node. This can only be done once the AST is complete, notably once all parent pointers are
-     * correctly assigned. But it also must be done before any AST cloning or execution.
+     * Apply to the AST all instances of {@link ASTProber} specified for the language, if any, held
+     * by this root node. This can only be done once the AST is complete, notably once all parent
+     * pointers are correctly assigned. But it also must be done before any AST cloning or
+     * execution.
      * <p>
      * If this is not done, then the AST will not be subject to debugging or any other
      * instrumentation-supported tooling.
@@ -198,7 +198,7 @@
      * Implementations should ensure that instrumentation is never applied more than once to an AST,
      * as this is not guaranteed to be error-free.
      *
-     * @see Probe#registerASTProber(com.oracle.truffle.api.instrument.ASTProber)
+     * @see TruffleLanguage
      */
     public void applyInstrumentation() {
     }