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

comment out broken IsA definition, rely on working version in base. Be explicit that typevars can ac like Object.

Browse Source
This commit is contained in:
Kevin Glynn 2011-03-02 19:36:48 +01:00
parent 52e51613cc
commit 8faedcd10a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs
View File

@ -2730,19 +2730,19 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
// Returns true if we are a subclass of other, or implements its interface // Returns true if we are a subclass of other, or implements its interface
public override bool IsA (TypeRepTemplate other, DirectoryHT<TypeRepTemplate> AppEnv) { // public override bool IsA (TypeRepTemplate other, DirectoryHT<TypeRepTemplate> AppEnv) {
InterfaceRepTemplate i = other as InterfaceRepTemplate; // InterfaceRepTemplate i = other as InterfaceRepTemplate;
if (i == null) // if (i == null)
{ // {
return false; // return false;
} // }
if (i.TypeName == this.TypeName) // if (i.TypeName == this.TypeName)
{ // {
return true; // return true;
} // }
return base.IsA(other,AppEnv); // return base.IsA(other,AppEnv);
} // }
//
public override ResolveResult Resolve(String name, bool forWrite, DirectoryHT<TypeRepTemplate> AppEnv) public override ResolveResult Resolve(String name, bool forWrite, DirectoryHT<TypeRepTemplate> AppEnv)
{ {
@ -3419,6 +3419,7 @@ namespace Twiglet.CS2J.Translator.TypeRep
public TypeVarRepTemplate (string typeName) : base(typeName) public TypeVarRepTemplate (string typeName) : base(typeName)
{ {
Inherits = new String[] { "System.Object" };
} }
public TypeVarRepTemplate (TypeVarRepTemplate copyFrom) : base(copyFrom) public TypeVarRepTemplate (TypeVarRepTemplate copyFrom) : base(copyFrom)
@ -3442,7 +3443,7 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
public override bool IsA (TypeRepTemplate other, DirectoryHT<TypeRepTemplate> AppEnv) { public override bool IsA (TypeRepTemplate other, DirectoryHT<TypeRepTemplate> AppEnv) {
return false; return base.IsA(other, AppEnv);
} }
#region Equality #region Equality