Skip to content

Commit

Permalink
Fix some ArrayList, Exception and BinaryReader problems.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kg
kg committed Apr 11, 2012
1 parent 701d607 commit b0f6509
Show file tree
Hide file tree
Showing 8 changed files with 132 additions and 86 deletions.
163 changes: 108 additions & 55 deletions Libraries/JSIL.Bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,23 +516,44 @@ JSIL.MakeDelegate("System.Func`4", true, ["T1", "T2", "T3", "TResult"]);

JSIL.ImplementExternals(
"System.Exception", function ($) {
$.Field({Static: false, Public: false}, "_Message", $.String, null);
var mscorlib = JSIL.GetCorlib();

$.Method({Static: false, Public: true }, ".ctor",
new JSIL.MethodSignature(null, [$.String]),
function (message) {
if (typeof (message) !== "undefined")
this._Message = String(message);
$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [], [])),
function _ctor () {
this._message = null;
}
);

$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$.String], [])),
function _ctor (message) {
this._message = message;
}
);

$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$.String, $asms[5].TypeRef("System.Exception")], [])),
function _ctor (message, innerException) {
this._message = message;
this._innerException = innerException;
}
);

$.Method({Static:false, Public:true }, "get_InnerException",
(new JSIL.MethodSignature($asms[5].TypeRef("System.Exception"), [], [])),
function get_InnerException () {
return this._innerException;
}
);

$.Method({Static: false, Public: true }, "get_Message",
new JSIL.MethodSignature($.String, []),
function () {
if ((typeof (this._Message) === "undefined") || (this._Message === null))
if ((typeof (this._message) === "undefined") || (this._message === null))
return System.String.Format("Exception of type '{0}' was thrown.", JSIL.GetTypeName(this));
else
return this._Message;
return this._message;
}
);

Expand Down Expand Up @@ -588,6 +609,7 @@ JSIL.ImplementExternals(

JSIL.MakeClass(Error, "System.Exception", true, [], function ($) {
$.Property({Public: true , Static: false}, "Message");
$.Property({Public: true , Static: false}, "InnerException");
});

JSIL.MakeClass("System.Exception", "System.InvalidCastException", true);
Expand Down Expand Up @@ -740,9 +762,16 @@ JSIL.MakeClass("System.Object", "System.Threading.Thread", true, [], function ($
$.Property({Public: true , Static: true }, "ManagedThreadId");
});

$jsilcore.$ListExternals = function ($) {
$jsilcore.$ListExternals = function ($, isArrayList) {
var mscorlib = JSIL.GetCorlib();

var T;
if (isArrayList) {
T = $.Object;
} else {
T = new JSIL.GenericParameter("T", "System.Collections.Generic.List`1");
}

var indexOfImpl = function (value) {
for (var i = 0; i < this._size; i++) {
var item = this._items[i];
Expand Down Expand Up @@ -791,20 +820,30 @@ $jsilcore.$ListExternals = function ($) {
}
);

$.Method({Static:false, Public:true }, "Add",
new JSIL.MethodSignature(null, [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")], []),
function (item) {
if (this._size >= this._items.length) {
this._items.push(item);
} else {
this._items[this._size] = item;
}
this._size += 1;
var addImpl = function (item) {
if (this._size >= this._items.length) {
this._items.push(item);
} else {
this._items[this._size] = item;
}
);
this._size += 1;
return this._size;
};

if (isArrayList) {
$.Method({Static:false, Public:true }, "Add",
new JSIL.MethodSignature($.Int32, [T], []),
addImpl
);
} else {
$.Method({Static:false, Public:true }, "Add",
new JSIL.MethodSignature(null, [T], []),
addImpl
);
}

$.Method({Static:false, Public:true }, "AddRange",
new JSIL.MethodSignature(null, [mscorlib.TypeRef("System.Collections.Generic.IEnumerable`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(null, [mscorlib.TypeRef("System.Collections.Generic.IEnumerable`1", [T])], []),
function (items) {
var e = JSIL.GetEnumerator(items);
try {
Expand All @@ -819,7 +858,7 @@ $jsilcore.$ListExternals = function ($) {
var tCollection = [null];

$.Method({Static:false, Public:true }, "AsReadOnly",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.ObjectModel.ReadOnlyCollection`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")]), [], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.ObjectModel.ReadOnlyCollection`1", [T]), [], []),
function () {
// FIXME
if (tCollection[0] === null) {
Expand All @@ -838,21 +877,21 @@ $jsilcore.$ListExternals = function ($) {
);

$.Method({Static:false, Public:true }, "Contains",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [T], []),
function (value) {
return indexOfImpl.call(this, value) >= 0;
}
);

$.Method({Static:false, Public:true }, "Exists",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [mscorlib.TypeRef("System.Predicate`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [mscorlib.TypeRef("System.Predicate`1", [T])], []),
function (predicate) {
return findIndexImpl.call(this, predicate) >= 0;
}
);

$.Method({Static:false, Public:true }, "Find",
new JSIL.MethodSignature(new JSIL.GenericParameter("T", "System.Collections.Generic.List`1"), [mscorlib.TypeRef("System.Predicate`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(new JSIL.GenericParameter("T", "System.Collections.Generic.List`1"), [mscorlib.TypeRef("System.Predicate`1", [T])], []),
function (predicate) {
var index = this.FindIndex$0(predicate);
if (index >= 0)
Expand All @@ -863,7 +902,7 @@ $jsilcore.$ListExternals = function ($) {
);

$.Method({Static:false, Public:true }, "FindAll",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.Generic.List`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")]), [mscorlib.TypeRef("System.Predicate`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.Generic.List`1", [T]), [mscorlib.TypeRef("System.Predicate`1", [T])], []),
function (predicate) {
var thisType = this.GetType();

Expand Down Expand Up @@ -903,7 +942,7 @@ $jsilcore.$ListExternals = function ($) {
);

$.Method({Static:false, Public:true }, "get_Item",
new JSIL.MethodSignature(new JSIL.GenericParameter("T", "System.Collections.Generic.List`1"), [mscorlib.TypeRef("System.Int32")], []),
new JSIL.MethodSignature(T, [mscorlib.TypeRef("System.Int32")], []),
function (index) {
if (index < 0)
throw new System.ArgumentOutOfRangeException("index");
Expand All @@ -914,29 +953,48 @@ $jsilcore.$ListExternals = function ($) {
}
);

$.Method({Static:false, Public:true }, "GetEnumerator",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.Generic.List`1/Enumerator", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")]), [], []),
function () {
// Detect whether we are a List<T> or an ArrayList.
if (this.$thisEnumeratorType === null) {
var elementType = this.T;
if (typeof (elementType) === "undefined")
elementType = System.Object;

this.$thisEnumeratorType = System.Collections.Generic.List$b1_Enumerator.Of(elementType)
}
var getEnumeratorImpl = function () {
// Detect whether we are a List<T> or an ArrayList.
if (this.$thisEnumeratorType === null) {
var elementType = this.T;
if (typeof (elementType) === "undefined")
elementType = System.Object;

return new (this.$thisEnumeratorType)(this);
this.$thisEnumeratorType = System.Collections.Generic.List$b1_Enumerator.Of(elementType)
}

return new (this.$thisEnumeratorType)(this);
};

$.Method({Static:false, Public:true }, "IEnumerable_GetEnumerator",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.IEnumerator"), [], []),
getEnumeratorImpl
);

$.Method({Static:false, Public:true }, "IEnumerable$b1_GetEnumerator",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.Generic.List`1/Enumerator", [T]), [], []),
getEnumeratorImpl
);

if (isArrayList) {
$.Method({Static:false, Public:true }, "GetEnumerator",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.IEnumerator"), [], []),
getEnumeratorImpl
);
} else {
$.Method({Static:false, Public:true }, "GetEnumerator",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Collections.Generic.List`1/Enumerator", [T]), [], []),
getEnumeratorImpl
);
}

$.Method({Static:false, Public:true }, "IndexOf",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Int32"), [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Int32"), [T], []),
indexOfImpl
);

$.Method({Static:false, Public:true }, "Remove",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [T], []),
function (item) {
var index = this._items.indexOf(item);
if (index === -1)
Expand All @@ -947,7 +1005,7 @@ $jsilcore.$ListExternals = function ($) {
);

$.Method({Static:false, Public:true }, "RemoveAll",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Int32"), [mscorlib.TypeRef("System.Predicate`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Int32"), [mscorlib.TypeRef("System.Predicate`1", [T])], []),
function (predicate) {
for (var i = 0; i < this._size; i++) {
var item = this._items[i];
Expand Down Expand Up @@ -977,28 +1035,21 @@ $jsilcore.$ListExternals = function ($) {
);

$.Method({Static:false, Public:true }, "Sort",
new JSIL.MethodSignature(null, [mscorlib.TypeRef("System.Comparison`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(null, [mscorlib.TypeRef("System.Comparison`1", [T])], []),
function (comparison) {
this._items.sort(comparison);
}
);

$.Method({Static:false, Public:true }, "ToArray",
new JSIL.MethodSignature($jsilcore.TypeRef("System.Array", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")]), [], []),
function () {
return Array.prototype.slice.call(this._items, 0, this._size);
}
);

$.Method({Static:false, Public:true }, "ToArray",
new JSIL.MethodSignature($jsilcore.TypeRef("System.Array", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")]), [], []),
new JSIL.MethodSignature($jsilcore.TypeRef("System.Array", [T]), [], []),
function () {
return Array.prototype.slice.call(this._items, 0, this._size);
}
);

$.Method({Static:false, Public:true }, "TrueForAll",
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [mscorlib.TypeRef("System.Predicate`1", [new JSIL.GenericParameter("T", "System.Collections.Generic.List`1")])], []),
new JSIL.MethodSignature(mscorlib.TypeRef("System.Boolean"), [mscorlib.TypeRef("System.Predicate`1", [T])], []),
function (predicate) {
for (var i = 0; i < this._size; i++) {
var item = this._items[i];
Expand All @@ -1012,10 +1063,12 @@ $jsilcore.$ListExternals = function ($) {
);
};

JSIL.ImplementExternals("System.Collections.Generic.List`1", $jsilcore.$ListExternals);
JSIL.ImplementExternals("System.Collections.Generic.List`1", function ($) {
$jsilcore.$ListExternals($, false);
});

$jsilcore.$ArrayListExternals = function ($) {
$jsilcore.$ListExternals($);
$jsilcore.$ListExternals($, true);

var mscorlib = JSIL.GetCorlib();
var toArrayImpl = function () {
Expand All @@ -1037,7 +1090,7 @@ $jsilcore.$ArrayListExternals = function ($) {
JSIL.ImplementExternals("System.Collections.ArrayList", $jsilcore.$ArrayListExternals);

$jsilcore.$CollectionExternals = function ($) {
$jsilcore.$ListExternals($);
$jsilcore.$ListExternals($, false);

var mscorlib = JSIL.GetCorlib();

Expand All @@ -1061,7 +1114,7 @@ $jsilcore.$CollectionExternals = function ($) {
JSIL.ImplementExternals("System.Collections.ObjectModel.Collection`1", $jsilcore.$CollectionExternals);

$jsilcore.$ReadOnlyCollectionExternals = function ($) {
$jsilcore.$ListExternals($);
$jsilcore.$ListExternals($, false);

var mscorlib = JSIL.GetCorlib();

Expand Down
10 changes: 9 additions & 1 deletion Libraries/JSIL.Core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3436,7 +3436,15 @@ JSIL.InterfaceBuilder.prototype.ImplementInterfaces = function (/* ...interfaces
JSIL.MethodSignature = function (returnType, argumentTypes, genericArgumentNames, context) {
this.context = context || $private;
this.returnType = returnType;
this.argumentTypes = argumentTypes;

if (!JSIL.IsArray(argumentTypes)) {
if (argumentTypes !== null)
throw new Error("ArgumentTypes must be an array or null");
else
this.argumentTypes = [];
} else {
this.argumentTypes = argumentTypes;
}

if (JSIL.IsArray(genericArgumentNames))
this.genericArgumentNames = genericArgumentNames;
Expand Down
12 changes: 6 additions & 6 deletions Libraries/JSIL.IO.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ JSIL.ImplementExternals("System.IO.FileStream", function ($) {
);

$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$.String, $asms[1].TypeRef("System.IO.FileMode")], [])),
(new JSIL.MethodSignature(null, [$.String, $jsilcore.TypeRef("System.IO.FileMode")], [])),
function _ctor (path, mode) {
System.IO.Stream.prototype._ctor.call(this);

Expand Down Expand Up @@ -175,14 +175,14 @@ JSIL.ImplementExternals(

JSIL.ImplementExternals("System.IO.BinaryWriter", function ($) {
$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$asms[1].TypeRef("System.IO.Stream")], [])),
(new JSIL.MethodSignature(null, [$jsilcore.TypeRef("System.IO.Stream")], [])),
function _ctor (output) {
this.m_stream = output;
}
);

$.Method({Static:false, Public:true }, "get_BaseStream",
(new JSIL.MethodSignature($asms[1].TypeRef("System.IO.Stream"), [], [])),
(new JSIL.MethodSignature($jsilcore.TypeRef("System.IO.Stream"), [], [])),
function get_BaseStream () {
return this.m_stream;
}
Expand All @@ -191,7 +191,7 @@ JSIL.ImplementExternals("System.IO.BinaryWriter", function ($) {

JSIL.ImplementExternals("System.IO.BinaryReader", function ($) {
$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$asms[1].TypeRef("System.IO.Stream")], [])),
(new JSIL.MethodSignature(null, [$jsilcore.TypeRef("System.IO.Stream")], [])),
function _ctor (input) {
System.Object.prototype._ctor.call(this);

Expand All @@ -204,7 +204,7 @@ JSIL.ImplementExternals("System.IO.BinaryReader", function ($) {
);

$.Method({Static:false, Public:true }, ".ctor",
(new JSIL.MethodSignature(null, [$asms[1].TypeRef("System.IO.Stream"), $asms[1].TypeRef("System.Text.Encoding")], [])),
(new JSIL.MethodSignature(null, [$jsilcore.TypeRef("System.IO.Stream"), $jsilcore.TypeRef("System.Text.Encoding")], [])),
function _ctor (input, encoding) {
System.Object.prototype._ctor.call(this);

Expand Down Expand Up @@ -428,7 +428,7 @@ JSIL.ImplementExternals("System.IO.BinaryReader", function ($) {
);

$.Method({Static:false, Public:true }, "get_BaseStream",
(new JSIL.MethodSignature($asms[1].TypeRef("System.IO.Stream"), [], [])),
(new JSIL.MethodSignature($jsilcore.TypeRef("System.IO.Stream"), [], [])),
function get_BaseStream () {
return this.m_stream;
}
Expand Down
18 changes: 0 additions & 18 deletions Proxies/Exceptions.cs
View file

This file was deleted.

Loading

0 comments on commit b0f6509

Please sign in to comment.