Some changes required for the new compiler.

- Import bleeding may be fixed, as I had to import a bunch of things I
  should have had to earlier.
- NOW they make duplicate variable definitions bad (but without block
  scoping... yay).
- Another hoopjump.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4233 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/as/com/threerings/io/ObjectInputStream.as

@@ -1,6 +1,7 @@
 package com.threerings.io {
 
 import flash.errors.IOError;
+import flash.errors.MemoryError;
 
 import flash.utils.ByteArray;
 import flash.utils.IDataInput;

src/as/com/threerings/io/Streamer.as

@@ -26,15 +26,15 @@ public class Streamer
 
         initStreamers();
 
-        for each (var streamer :Streamer in _streamers) {
+        var streamer :Streamer;
+        for each (streamer in _streamers) {
             if (streamer.isStreamerFor(obj)) {
                 return streamer;
             }
         }
 
         if (obj is TypedArray) {
-            var streamer :Streamer = new ArrayStreamer(
-                (obj as TypedArray).getJavaType());
+            streamer = new ArrayStreamer((obj as TypedArray).getJavaType());
             _streamers.push(streamer);
             return streamer;
         }
@@ -68,7 +68,8 @@ public class Streamer
         initStreamers();
 
         // see if we have a streamer for it
-        for each (var streamer :Streamer in _streamers) {
+        var streamer :Streamer;
+        for each (streamer in _streamers) {
             if (streamer.getJavaClassName() === jname) {
                 return streamer;
             }
@@ -76,7 +77,7 @@ public class Streamer
 
         // see if it's an array that we unstream using an ArrayStreamer
         if (jname.charAt(0) === "[") {
-            var streamer :Streamer = new ArrayStreamer(jname);
+            streamer = new ArrayStreamer(jname);
             _streamers.push(streamer);
             return streamer;
         }

src/as/com/threerings/io/streamers/ArrayStreamer.as

@@ -2,9 +2,11 @@ package com.threerings.io.streamers {
 
 import com.threerings.util.ClassUtil;
 
+import com.threerings.io.ArrayMask;
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamer;
+import com.threerings.io.Translations;
 import com.threerings.io.TypedArray;
 
 /**
@@ -75,22 +77,23 @@ public class ArrayStreamer extends Streamer
             :void
     {
         var arr :Array = (obj as Array);
+        var ii :int;
         out.writeInt(arr.length);
         if (_elementType == int) {
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 out.writeInt(arr[ii] as int);
             }
 
         } else if (_isFinal) {
             var mask :ArrayMask = new ArrayMask(arr.length);
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 if (arr[ii] != null) {
                     mask.setBit(ii);
                 }
             }
             mask.writeTo(out);
             // now write the populated elements
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 var element :Object = arr[ii];
                 if (element != null) {
                     out.writeBareObjectImpl(element, _delegate);
@@ -98,7 +101,7 @@ public class ArrayStreamer extends Streamer
             }
 
         } else {
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 out.writeObject(arr[ii]);
             }
         }
@@ -108,15 +111,16 @@ public class ArrayStreamer extends Streamer
             :void
     {
         var arr :Array = (obj as Array);
+        var ii :int;
         if (_elementType == int) {
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 arr[ii] = ins.readInt();
             }
 
         } else if (_isFinal) {
             var mask :ArrayMask = new ArrayMask();
             mask.readFrom(ins);
-            for (var ii :int = 0; ii < length; ii++) {
+            for (ii = 0; ii < length; ii++) {
                 if (mask.isSet(ii)) {
                     var target :Object;
                     if (_delegate == null) {
@@ -130,7 +134,7 @@ public class ArrayStreamer extends Streamer
             } 
 
         } else {
-            for (var ii :int = 0; ii < arr.length; ii++) {
+            for (ii = 0; ii < arr.length; ii++) {
                 arr[ii] = ins.readObject();
             } 
         }