Skip to content
This repository has been archived by the owner on Aug 24, 2022. It is now read-only.

JsAPI #929

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

JsAPI #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d5efab
Field type resolution for generic instanses fixed (#913). Test added.
iskiselev Nov 29, 2015
1287657
Dynamic custom processing on translation removed.
iskiselev Nov 23, 2015
7b08c67
Fixed supposed error for dynamic tests.
iskiselev Dec 5, 2015
7c20f6d
New JsAPI (#532). Tests updated, removed depricated tests.
iskiselev Dec 9, 2015
9d584f0
JsAPI errors fixed, first test case added.
iskiselev Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions JSIL.Libraries/Includes/Bootstrap/Core/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,33 @@ JSIL.MakeClass("System.ComponentModel.TypeConverter", "System.ComponentModel.Exp

JSIL.MakeDelegate("System.Action", true, [], JSIL.MethodSignature.Void);
JSIL.MakeDelegate("System.Action`1", true, ["T"], new JSIL.MethodSignature(null, [new JSIL.GenericParameter("T", "System.Action`1").in()]));
JSIL.MakeDelegate("System.Action`2", true, ["T1", "T2"], new JSIL.MethodSignature(null, [new JSIL.GenericParameter("T1", "System.Action`2").in(), new JSIL.GenericParameter("T2", "System.Action`2").in()]));
JSIL.MakeDelegate("System.Action`3", true, ["T1", "T2", "T3"], new JSIL.MethodSignature(null, [
new JSIL.GenericParameter("T1", "System.Action`3").in(), new JSIL.GenericParameter("T2", "System.Action`3").in(),
new JSIL.GenericParameter("T3", "System.Action`3").in()
]));

JSIL.MakeDelegate("System.Func`1", true, ["TResult"], new JSIL.MethodSignature(new JSIL.GenericParameter("TResult", "System.Func`1").out(), null));
JSIL.MakeDelegate("System.Func`2", true, ["T", "TResult"], new JSIL.MethodSignature(new JSIL.GenericParameter("TResult", "System.Func`2").out(), [new JSIL.GenericParameter("T", "System.Func`2").in()]));
JSIL.MakeDelegate("System.Func`3", true, ["T1", "T2", "TResult"], new JSIL.MethodSignature(new JSIL.GenericParameter("TResult", "System.Func`3").out(), [new JSIL.GenericParameter("T1", "System.Func`3").in(), new JSIL.GenericParameter("T2", "System.Func`3").in()]));
JSIL.MakeDelegate("System.Func`4", true, ["T1", "T2", "T3", "TResult"], new JSIL.MethodSignature(new JSIL.GenericParameter("TResult", "System.Func`4").out(), [
new JSIL.GenericParameter("T1", "System.Func`4").in(), new JSIL.GenericParameter("T2", "System.Func`4").in(),
new JSIL.GenericParameter("T3", "System.Func`4").in()
]));

(function() {
for (var i = 2; i <= 16; i++) {
var actionName = "System.Action`" + i;
var funcName = "System.Func`" + (i + 1);
var genericArgsForActions = [];
var genericArgsForFunctions = [];

var inputForActions = [];
var inputForFunctions = [];
for (var j = 0; j < i; j++) {
var name = "T" + (j + 1);
genericArgsForActions.push(name);
genericArgsForFunctions.push(name);

inputForActions.push(new JSIL.GenericParameter(name, actionName).in());
inputForFunctions.push(new JSIL.GenericParameter(name, funcName).in());
}

genericArgsForFunctions.push("TResult");

JSIL.MakeDelegate(actionName, true, genericArgsForActions, new JSIL.MethodSignature(null, inputForActions));
JSIL.MakeDelegate(funcName, true, genericArgsForFunctions, new JSIL.MethodSignature(new JSIL.GenericParameter("TResult", funcName).out(), inputForFunctions));
}
})();

JSIL.MakeDelegate("System.Predicate`1", true, ["in T"], new JSIL.MethodSignature($jsilcore.TypeRef("System.Boolean"), [new JSIL.GenericParameter("T", "System.Predicate`1").in()]));

Expand Down Expand Up @@ -331,4 +345,4 @@ JSIL.MakeInterface(
$.Method({}, "CleanUpManagedData", JSIL.MethodSignature.Action($.Object));
$.Method({}, "GetNativeDataSize", JSIL.MethodSignature.Return($.Int32));
}, []);
//? }
//? }
Loading