Mercurial > hg > truffle
changeset 13663:434b86962d0d
Merge with d2976008ce631154918becdeda6ca54101f202c6
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Thu, 16 Jan 2014 16:43:56 -0800 |
| parents | 91eebfc42e9f (diff) d2976008ce63 (current diff) |
| children | f150a67b99e3 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/instrument/NodePhylum.java Thu Jan 16 21:47:17 2014 +0000 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/instrument/NodePhylum.java Thu Jan 16 16:43:56 2014 -0800 @@ -29,7 +29,7 @@ * and other simple tool behavior. These categories (<em>phyla</em>) should correspond to program * structures that are meaningful to a programmer using the guest language. A Truffle node without a * proxy carrying some phylum should be treated as an artifact of the guest language implementation - * and should never to the user of a guest language programming tool. + * and should never be visible to the user of a guest language programming tool. * <p> * Note that phyla are not intended to represent a partition of user-visible node categories, as the * relative categorization of nodes can change with the particular programming tasks at hand.
--- a/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/core/CoreLibrary.java Thu Jan 16 21:47:17 2014 +0000 +++ b/graal/com.oracle.truffle.ruby.runtime/src/com/oracle/truffle/ruby/runtime/core/CoreLibrary.java Thu Jan 16 16:43:56 2014 -0800 @@ -20,6 +20,8 @@ public class CoreLibrary { + public static final String RUBY_VERSION = "2.1.0"; + private final RubyContext context; private RubyClass argumentErrorClass; @@ -164,7 +166,7 @@ // Set constants - objectClass.setConstant("RUBY_VERSION", new RubyString(stringClass, "2.1.0")); + objectClass.setConstant("RUBY_VERSION", new RubyString(stringClass, RUBY_VERSION)); objectClass.setConstant("RUBY_PATCHLEVEL", 0); objectClass.setConstant("RUBY_ENGINE", new RubyString(stringClass, "rubytruffle")); objectClass.setConstant("RUBY_PLATFORM", new RubyString(stringClass, "jvm"));