backup/cs2j
1
0
Fork 0
mirror of https://github.com/twiglet/cs2j.git synced 2025-01-18 13:15:17 +01:00
Code Issues Projects Releases Activity

handle null delegates

Browse Source
This commit is contained in:
Kevin Glynn 2011-05-20 14:00:45 +02:00
parent f49d562c9c
commit 63cbb54855
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Fragments.cs
View File

@ -171,6 +171,8 @@ namespace Twiglet.CS2J.Translator
private System.Collections.Generic.IList<${Del}> _invocationList = new ArrayList<${Del}>();
public static ${Del} Combine ${TyArgs} (${Del} a, ${Del} b) throws Exception {
if (a == null) return b;
if (b == null) return a;
${DelClass} ret = new ${DelClass}();
ret._invocationList = a.GetInvocationList();
ret._invocationList.addAll(b.GetInvocationList());
@ -178,6 +180,7 @@ namespace Twiglet.CS2J.Translator
}
public static ${Del} Remove ${TyArgs} (${Del} a, ${Del} b) throws Exception {
if (a == null || b == null) return a;
System.Collections.Generic.IList<${Del}> aInvList = a.GetInvocationList();
System.Collections.Generic.IList<${Del}> newInvList = ListSupport.removeFinalStretch(aInvList, b.GetInvocationList());
if (aInvList == newInvList) {