@@ -4,11 +4,10 @@
<classpathentry excluding="**/CVS/*" kind="src" output="build/classes/test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/bsf.jar"/>
- <classpathentry kind="lib" path="lib/junit.jar"/>
- <classpathentry kind="lib" path="lib/ant.jar"/>
<classpathentry kind="lib" path="lib/asm-commons-2.2.3.jar"/>
<classpathentry kind="lib" path="lib/asm-2.2.3.jar"/>
<classpathentry kind="lib" path="lib/jline-0.9.91.jar"/>
<classpathentry kind="lib" path="lib/backport-util-concurrent.jar"/>
+ <classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="output" path="build/classes/jruby"/>
</classpath>
.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jruby</name>
+ <name>jruby_trunk</name>
<comment></comment>
<projects>
</projects>
@@ -12,16 +12,6 @@
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>auto,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Serialize Builtin Files.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
.project
@@ -97,14 +97,9 @@
<classpath refid="build.classpath"/>
</javac>
- <taskdef name="jruby-serialize" classname="org.jruby.util.ant.JRubySerialize">
- <classpath path="${jruby.classes.dir}"/>
- </taskdef>
-
<copy todir="${jruby.classes.dir}">
<fileset dir="${src.dir}">
<include name="**/*.rb"/>
- <exclude name="builtin/**/*.rb"/>
</fileset>
</copy>
@@ -137,16 +132,7 @@
description="Compile the source files for the project.">
</target>
- <target name="serialize" depends="compile"
- description="Serializes builting Ruby libraries into Java format">
- <jruby-serialize destdir="${jruby.classes.dir}">
- <fileset dir="${src.dir}">
- <include name="builtin/**/*.rb"/>
- </fileset>
- </jruby-serialize>
- </target>
-
- <target name="generate-method-classes" depends="serialize">
+ <target name="generate-method-classes" depends="compile">
<touch file="${build.dir}/__empty.rb"/>
<java classname="org.jruby.Main" fork="true">
<classpath refid="build.classpath"/>
@@ -158,15 +144,6 @@
<delete file="${build.dir}/__empty.rb" quiet="true"/>
</target>
- <target name="serialize.rubylib" depends="compile"
- description="Serializes the core Ruby library into Java format">
- <jruby-serialize destdir="${jruby.classes.dir}" verbose="true">
- <fileset dir="${ruby.home}/lib/ruby/1.8">
- <patternset refid="ruby.src.pattern"/>
- </fileset>
- </jruby-serialize>
- </target>
-
<target name="jar-jruby" depends="generate-method-classes">
<jar destfile="${lib.dir}/jruby.jar" compress="true">
<fileset dir="${jruby.classes.dir}">
@@ -220,7 +197,6 @@
<fileset dir="${jruby.classes.dir}">
<include name="**/*.class"/>
<include name="**/*.properties"/>
- <include name="**/*.rb.ast.ser"/>
<exclude name="org/jruby/util/ant/**/*.class"/>
</fileset>
<fileset dir="${basedir}/lib/ruby/1.8">
@@ -264,7 +240,7 @@
<target name="jar" depends="jar-jruby" description="Create the jruby.jar file">
</target>
- <target name="jar.standalone" depends="generate-method-classes, serialize.rubylib, jar"
+ <target name="jar.standalone" depends="generate-method-classes, jar"
description="Create a standalone jruby.jar file using libraries from RUBY_HOME/lib/ruby/1.8"/>
<target name="compile-test" depends="jar" description="Compile the unit tests">
build.xml
@@ -263,6 +263,10 @@ public final class Ruby {
return newInstance(config);
}
+ public IRubyObject evalScript(Reader reader, String name) {
+ return eval(parse(reader, name, getCurrentContext().getCurrentScope(), 0));
+ }
+
/**
* Evaluates a script and returns a RubyObject.
*/
src/org/jruby/Ruby.java
@@ -58,13 +58,12 @@ import org.jruby.runtime.Constants;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.BuiltinScript;
import org.jruby.util.JRubyFile;
-import org.jruby.util.PreparsedScript;
/**
* <b>How require works in JRuby</b>
* When requiring a name from Ruby, JRuby will first remove any file extension it knows about,
* thereby making it possible to use this string to see if JRuby has already loaded
- * the name in question. If a .rb or .rb.ast.ser extension is specified, JRuby will only try
+ * the name in question. If a .rb extension is specified, JRuby will only try
* those extensions when searching. If a .so, .o, .dll, or .jar extension is specified, JRuby
* will only try .so or .jar when searching. Otherwise, JRuby goes through the known suffixes
* (.rb, .rb.ast.ser, .so, and .jar) and tries to find a library with this name. The process for finding a library follows this order
@@ -122,10 +121,10 @@ import org.jruby.util.PreparsedScript;
public class LoadService {
protected static final String JRUBY_BUILTIN_SUFFIX = ".rb";
- protected static final String[] sourceSuffixes = { ".rb", ".rb.ast.ser" };
+ protected static final String[] sourceSuffixes = { ".rb" };
protected static final String[] extensionSuffixes = { ".so", ".jar" };
- protected static final String[] allSuffixes = { ".rb", ".rb.ast.ser", ".so", ".jar" };
- protected static final Pattern sourcePattern = Pattern.compile("\\.(?:rb|rb\\.ast\\.ser)$");
+ protected static final String[] allSuffixes = { ".rb", ".so", ".jar" };
+ protected static final Pattern sourcePattern = Pattern.compile("\\.(?:rb)$");
protected static final Pattern extensionPattern = Pattern.compile("\\.(?:so|o|dll|jar)$");
protected final RubyArray loadPath;
@@ -382,8 +381,6 @@ public class LoadService {
if (file.endsWith(".jar")) {
return new JarredScript(resource);
- } else if (file.endsWith(".rb.ast.ser")) {
- return new PreparsedScript(resource);
} else {
return new ExternalScript(resource, file);
}
@@ -397,8 +394,6 @@ public class LoadService {
if (file.endsWith(".jar")) {
return new JarredScript(resource);
- } else if (file.endsWith(".rb.ast.ser")) {
- return new PreparsedScript(resource);
} else {
return new ExternalScript(resource, file);
}
src/org/jruby/runtime/load/LoadService.java
@@ -30,18 +30,16 @@
***** END LICENSE BLOCK *****/
package org.jruby.util;
-import java.io.BufferedInputStream;
+import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
-import org.ablaf.ast.IAstDecoder;
import org.jruby.Ruby;
-import org.jruby.ast.Node;
-import org.jruby.ast.util.RubyAstMarshal;
import org.jruby.runtime.load.Library;
/**
- * Loading of pre-parsed, serialized, Ruby scripts that are built into JRuby.
+ * Loading of Ruby scripts that are built into JRuby.
*/
public class BuiltinScript implements Library {
private final String name;
@@ -51,21 +49,11 @@ public class BuiltinScript implements Library {
}
public void load(Ruby runtime) throws IOException {
- runtime.loadNode("jruby builtin", getNode(runtime));
- }
-
- private Node getNode(Ruby runtime) throws IOException {
- String resourceName = "/builtin/" + name + ".rb.ast.ser";
+ String resourceName = "/builtin/" + name + ".rb";
InputStream in = getClass().getResourceAsStream(resourceName);
- if (in == null) {
- throw runtime.newIOError("Resource not found: " + resourceName);
- }
- in = new BufferedInputStream(in);
- IAstDecoder decoder = RubyAstMarshal.getInstance().openDecoder(in);
- try {
- return decoder.readNode();
- } finally {
- decoder.close();
- }
+
+ if (in == null) throw runtime.newIOError("Resource not found: " + resourceName);
+
+ runtime.evalScript(new BufferedReader(new InputStreamReader(in)), name);
}
}
src/org/jruby/util/BuiltinScript.java
.externalToolBuilders/Serialize Builtin Files.launch
src/org/jruby/util/PreparsedScript.java
src/org/jruby/util/ant/JRubySerialize.java
632666459607151a0fc09d46d301fb9ea8ba3a1e
enebo
enebo@961051c9-f516-0410-bf72-c9f7e237a7b7
http://github.com/vvs/jruby/commit/44da7d71e63482fd1f9b6b1ef32caa4a3b516172
44da7d71e63482fd1f9b6b1ef32caa4a3b516172
2007-05-24T15:00:02-07:00
2007-05-24T15:00:02-07:00
JRUBY-994: Remove jruby serialization feature
git-svn-id: https://svn.codehaus.org/jruby/trunk/jruby@3734 961051c9-f516-0410-bf72-c9f7e237a7b7
d6c7a3b092635c9f0ba06c31eb98053070555c13
enebo
enebo@961051c9-f516-0410-bf72-c9f7e237a7b7