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

- have black listed methods that should not be renamed

Browse Source 
- supported interfaces map points to Import list and blacklisted methods list
- create empty symtab in InitParser
- class_member_declaration has symtab scope
- add isJavaIsh route for type arguments
This commit is contained in:
Kevin Glynn 2011-10-12 10:38:18 +02:00
parent a71555167a
commit a6f8dac7c6
1 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/NetMaker.g
View File

@ -31,7 +31,10 @@ scope NSContext {
ClassRepTemplate baseClass; ClassRepTemplate baseClass;
// Supported interfaces // Supported interfaces
IList<InterfaceRepTemplate> interfaceList; List<InterfaceRepTemplate> interfaceList;
// methods that should not be renamed
List<string> blackListedMethods;
} }
// A scope to keep track of the mapping from variables to types // A scope to keep track of the mapping from variables to types
@ -194,20 +197,34 @@ scope MkNonGeneric {
} }
} }
public class SupportedInterfaceInfo {
public SupportedInterfaceInfo() {
Imports = new List<string>();
BlackListedMethods = new List<string>();
}
public List<string> Imports { get; set; }
public List<string> BlackListedMethods { get; set; }
}
// For classes that implement some specific interface types (such as IEnumerable) we add // For classes that implement some specific interface types (such as IEnumerable) we add
// additional methods so that they can support an equivalent Java Interface (e.g. Iterable). // additional methods so that they can support an equivalent Java Interface (e.g. Iterable).
// The keys of this map are the supported interface. We map them to a set of imports that are // The keys of this map are the supported interface. We map them to a set of imports that are
// needed for the additional methods // needed for the additional methods
// TODO: Move this to Fragments where the code is maintained. // TODO: Move this to Fragments where the code is maintained.
private Dictionary<InterfaceRepTemplate, IList<string>> supportedInterfaces = null; private Dictionary<InterfaceRepTemplate, SupportedInterfaceInfo> supportedInterfaces = null;
protected Dictionary<InterfaceRepTemplate, IList<string>> SupportedInterfaces { protected Dictionary<InterfaceRepTemplate, SupportedInterfaceInfo> SupportedInterfaces {
get { get {
if (supportedInterfaces == null) { if (supportedInterfaces == null) {
supportedInterfaces = new Dictionary<InterfaceRepTemplate, IList<string>>(); supportedInterfaces = new Dictionary<InterfaceRepTemplate, SupportedInterfaceInfo>();
supportedInterfaces[IEnumerableType] = new List<String>(); supportedInterfaces[IEnumerableType] = new SupportedInterfaceInfo();
supportedInterfaces[GenericIEnumerableType] = new List<String>(); supportedInterfaces[GenericIEnumerableType] = new SupportedInterfaceInfo();
supportedInterfaces[ICollectionType] = new List<String>(); supportedInterfaces[ICollectionType] = new SupportedInterfaceInfo();
supportedInterfaces[GenericICollectionType] = new List<String>();
supportedInterfaces[GenericICollectionType] = new SupportedInterfaceInfo();
supportedInterfaces[GenericICollectionType].BlackListedMethods.AddRange(new string[] {"Add", "Clear", "Contains", "Remove"});
supportedInterfaces[GenericICollectionType].Imports.AddRange(new string[] {"java.util.Collection"});
} }
return supportedInterfaces; return supportedInterfaces;
} }
@ -988,6 +1005,7 @@ scope MkNonGeneric {
NSContext_stack.Push(new NSContext_scope()); NSContext_stack.Push(new NSContext_scope());
PrimitiveRep_stack.Push(new PrimitiveRep_scope()); PrimitiveRep_stack.Push(new PrimitiveRep_scope());
MkNonGeneric_stack.Push(new MkNonGeneric_scope()); MkNonGeneric_stack.Push(new MkNonGeneric_scope());
SymTab_stack.Push(new SymTab_scope());
// Set up dynamic scopes // Set up dynamic scopes
$PrimitiveRep::primitiveTypeAsObject = false; $PrimitiveRep::primitiveTypeAsObject = false;
@ -1001,6 +1019,9 @@ scope MkNonGeneric {
$NSContext::baseClass = ObjectType; $NSContext::baseClass = ObjectType;
$NSContext::interfaceList = new List<InterfaceRepTemplate>(); $NSContext::interfaceList = new List<InterfaceRepTemplate>();
$NSContext::blackListedMethods = new List<string>();
$SymTab::symtab = new Dictionary<string,TypeRepTemplate>();
} }
} }
@ -1021,6 +1042,7 @@ scope NSContext, PrimitiveRep, MkNonGeneric;
$NSContext::baseClass = ObjectType; $NSContext::baseClass = ObjectType;
$NSContext::interfaceList = new List<InterfaceRepTemplate>(); $NSContext::interfaceList = new List<InterfaceRepTemplate>();
$NSContext::blackListedMethods = new List<string>();
}: }:
^(pkg=PACKAGE ns=PAYLOAD { $NSContext::currentNS = $ns.text; } dec=type_declaration ) ^(pkg=PACKAGE ns=PAYLOAD { $NSContext::currentNS = $ns.text; } dec=type_declaration )
@ -1045,7 +1067,11 @@ modifier:
| 'readonly' | 'volatile' | 'extern' | 'virtual' | 'override' | FINAL ; | 'readonly' | 'volatile' | 'extern' | 'virtual' | 'override' | FINAL ;
class_member_declaration class_member_declaration
scope SymTab;
@init { @init {
$SymTab::symtab = new Dictionary<string,TypeRepTemplate>();
ResolveResult methodResult = null; ResolveResult methodResult = null;
MethodRepTemplate methodTemplate = null; MethodRepTemplate methodTemplate = null;
}: }:
@ -1112,9 +1138,13 @@ class_member_declaration
} }
// (Optionally) rewrite the method name // (Optionally) rewrite the method name
if ($identifier.thetext != "Main" && Cfg.TranslatorMakeJavaNamingConventions) { if ($identifier.thetext != "Main") {
// Leave Main() as it is because we wrap it with a special main method if (!$NSContext::blackListedMethods.Contains($identifier.thetext)) {
$identifier.tree.Token.Text = toJavaConvention(CSharpEntity.METHOD, $identifier.thetext); if (Cfg.TranslatorMakeJavaNamingConventions) {
// Leave Main() as it is because we wrap it with a special main method
$identifier.tree.Token.Text = toJavaConvention(CSharpEntity.METHOD, $identifier.thetext);
}
}
} }
} }
-> ^(METHOD attributes? modifiers? { dupTree(methodTemplate != null && methodTemplate.Return.ForceBoxed && $type.boxedTree != null ? $type.boxedTree : $type.tree) } -> ^(METHOD attributes? modifiers? { dupTree(methodTemplate != null && methodTemplate.Return.ForceBoxed && $type.boxedTree != null ? $type.boxedTree : $type.tree) }
@ -1777,14 +1807,26 @@ qid_part:
generic_argument_list returns [List<TypeRepTemplate> argTypes, List<CommonTree> argTrees]: generic_argument_list returns [List<TypeRepTemplate> argTypes, List<CommonTree> argTrees]:
'<' type_arguments '>' { $argTypes = $type_arguments.tyTypes; $argTrees = $type_arguments.argTrees; }; '<' type_arguments '>' { $argTypes = $type_arguments.tyTypes; $argTrees = $type_arguments.argTrees; };
type_arguments returns [List<TypeRepTemplate> tyTypes, List<CommonTree> argTrees]
type_arguments returns [List<TypeRepTemplate> tyTypes, List<CommonTree> argTrees]
scope PrimitiveRep; scope PrimitiveRep;
@init { @init {
$PrimitiveRep::primitiveTypeAsObject = true; $PrimitiveRep::primitiveTypeAsObject = true;
$tyTypes = new List<TypeRepTemplate>(); $tyTypes = new List<TypeRepTemplate>();
$argTrees = new List<CommonTree>(); $argTrees = new List<CommonTree>();
}: }:
t1=type { $tyTypes.Add($t1.dotNetType); $argTrees.Add(dupTree($t1.tree)); } (',' tn=type { $tyTypes.Add($tn.dotNetType); $argTrees.Add(dupTree($tn.tree)); })* ; t1=type_argument { $tyTypes.Add($t1.dotNetType); $argTrees.Add(dupTree($t1.tree)); } (',' tn=type_argument { $tyTypes.Add($tn.dotNetType); $argTrees.Add(dupTree($tn.tree)); } )* ;
public type_argument returns [TypeRepTemplate dotNetType]:
{this.IsJavaish}?=> javaish_type_argument {$dotNetType = $javaish_type_argument.dotNetType; }
| type {$dotNetType = $type.dotNetType; }
;
public javaish_type_argument returns [TypeRepTemplate dotNetType]:
('?' 'extends')=> '?' 'extends' type {$dotNetType = $type.dotNetType; }
| '?' {$dotNetType = new TypeVarRepTemplate("?"); }
| type {$dotNetType = $type.dotNetType; }
;
// keving: TODO: Look for type vars // keving: TODO: Look for type vars
type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees, CommonTree boxedTree] type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees, CommonTree boxedTree]
@ -2505,6 +2547,7 @@ scope NSContext,SymTab;
$NSContext::baseClass = ObjectType; $NSContext::baseClass = ObjectType;
$NSContext::interfaceList = new List<InterfaceRepTemplate>(); $NSContext::interfaceList = new List<InterfaceRepTemplate>();
$NSContext::blackListedMethods = new List<string>();
$SymTab::symtab = new Dictionary<string, TypeRepTemplate>(); $SymTab::symtab = new Dictionary<string, TypeRepTemplate>();
} }
@ -2594,9 +2637,10 @@ class_body
@init { @init {
CommonTree collectNodes = null; CommonTree collectNodes = null;
string newMethods = ""; string newMethods = "";
foreach (KeyValuePair<InterfaceRepTemplate,IList<string>> member in SupportedInterfaces) { foreach (KeyValuePair<InterfaceRepTemplate,SupportedInterfaceInfo> member in SupportedInterfaces) {
InterfaceRepTemplate supportedIface = member.Key; InterfaceRepTemplate supportedIface = member.Key;
IList<string> supportedIfaceImports = member.Value; IList<string> supportedIfaceImports = member.Value.Imports;
IList<string> supportedIfaceBlackList = member.Value.BlackListedMethods;
bool sup = false; bool sup = false;
List<String> targs = new List<String>(); List<String> targs = new List<String>();
foreach (InterfaceRepTemplate implementedIface in $NSContext::interfaceList) { foreach (InterfaceRepTemplate implementedIface in $NSContext::interfaceList) {
@ -2610,8 +2654,8 @@ class_body
} }
if (sup) { if (sup) {
newMethods = newMethods + this.getMethods(supportedIface.TypeName, targs); newMethods = newMethods + this.getMethods(supportedIface.TypeName, targs);
// AddToImports(supportedIface.Imports);
AddToImports(supportedIfaceImports); AddToImports(supportedIfaceImports);
$NSContext::blackListedMethods.AddRange(supportedIfaceBlackList);
} }
} }
if (!String.IsNullOrEmpty(newMethods)) { if (!String.IsNullOrEmpty(newMethods)) {