diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java @ 13804:3840d61e0e68

Merge.
author Christian Humer <christian.humer@gmail.com>
date Tue, 28 Jan 2014 12:52:57 +0100
parents e076c87ab175
children 641f22b1c6b8
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Fri Jan 24 15:55:41 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Tue Jan 28 12:52:57 2014 +0100
@@ -77,7 +77,7 @@
 
     /**
      * Returns the number of nodes that would be returned if {@link #inline()} would get invoked.
-     * This node count may be used for the calculation of a smart inlining heuristic.
+     * This node count may be used for the calculation in a smart inlining heuristic.
      * 
      * @see RootNode#inline()
      * @see RootNode#isInlinable()
@@ -93,9 +93,9 @@
     }
 
     /**
-     * Returns true if this RootNode can be inlined. If this method returns true proper
-     * implementations of {@link #inline()} and {@link #getInlineNodeCount()} must be provided.
-     * Returns true by default.
+     * Returns true if this RootNode can be inlined. If this method returns true implementations of
+     * {@link #inline()} and {@link #getInlineNodeCount()} must be provided. Returns
+     * <code>true</code> by default.
      * 
      * @see RootNode#inline()
      * @see RootNode#getInlineNodeCount()