Merge pull request #424 from MagLev/allen_magparse3

Allen magparse3

src/kernel/bootstrap/BasicObject.rb

@@ -0,0 +1,4 @@
+class BasicObject
+  # BasicObject is identically, the Smalltalk class ProtoObject
+
+end

src/kernel/bootstrap/Globals.rb

@@ -4,6 +4,7 @@
 #            Ruby class name , Gemstone class name
 RUBY.global('Array', 'Array')
 # deleted Behavior
+RUBY.global('BasicObject', 'ProtoObject')
 RUBY.global('Binding', 'RubyBinding')
 RUBY.global('Boolean', 'Boolean')
 RUBY.global('Class', 'Metaclass3')
@@ -158,12 +159,12 @@
 # RUBY_PLATFORM  is installed in RubyContext>>_initTransient:
 RUBY_VERSION = '1.9.3'
 # Note - the packager modifies the date on any line starting with RUBY_RELEASE_DATE
-RUBY_RELEASE_DATE = '2015-07-20'
+RUBY_RELEASE_DATE = '2015-07-27'
 RUBY_PATCHLEVEL = 327
 RUBY_DESCRIPTION = 'ruby 1.9.3 (maglev patchlevel 327)'
 RUBY_COPYRIGHT = 'ruby - Copyright (C) 1993-2010 Yukihiro Matsumoto; maglev additions Copyright(C) 2009-2010 GemStone Systems Inc.'
 
-VERSION = '1.2Alpha7'
+VERSION = '1.2Alpha8'
 
 MAGLEV_VERSION = VERSION  # per Trac 901
 

src/kernel/kernel.rb

@@ -49,6 +49,7 @@
 RUBY.require 'kernel/bootstrap/Class.rb'
 RUBY.require 'kernel/bootstrap/StClass.rb'
 RUBY.require 'kernel/bootstrap/Object.rb'
+RUBY.require 'kernel/bootstrap/BasicObject.rb'
 RUBY.require 'kernel/bootstrap/Module2.rb'
 RUBY.require 'kernel/bootstrap/Module3.rb'
 RUBY.require 'kernel/bootstrap/Maglev1.rb'
@@ -174,3 +175,4 @@
 RUBY.require 'kernel/delta/pointer.rb'
 RUBY.require 'kernel/delta/buffer.rb'
 RUBY.require 'kernel/bootstrap/Argf.rb'
+RUBY.require 'kernel/bootstrap/BasicObject.rb'

src/kernel/parser/Makefile

@@ -7,7 +7,7 @@ ifeq "$(GEMSTONE)" ""
 else
   ICU_INCL := -I$(GEMSTONE)/../../icu/source/common
 endif
-GSVERSION   := 3.1.0.2.3-64
+GSVERSION   := 3.1.0.2.4-64
 
 CC        := /usr/bin/g++
 COPTIMIZE_FLAGS := -O3 -g -Wuninitialized

src/smalltalk/ruby/allprims.gs

@@ -35,6 +35,13 @@ commit
 logout
 set user DataCurator pass swordfish
 login
+run
+  "For issue 269, make Object's env 1 superclass ProtoObject before
+   Object includes Kernel"
+  Object persistentRubySuperclass: 1 put: ProtoObject .
+  true
+%
+commit
 run
  RubyBridge initialize . "reset generic bridge methods"
  RubyContext commitTransaction  .

version.txt

@@ -1,3 +1,3 @@
-maglev 1.2Alpha7 (ruby 1.9) (2015-07-20 rev 1.2Alpha7-36916)
-GEMSTONE: gss64_maglev_1_9_branch-36916
-Mon Jul 20, 15:00:00 PDT 2015
+maglev 1.2Alpha8 (ruby 1.9) (2015-07-27 rev 1.2Alpha8-36962)
+GEMSTONE: gss64_maglev_1_9_branch-36962
+Mon Jul 27, 09:54:00 PDT 2015