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

move mkGenericTypeAlias and NSPrefix into CommonWalker and start using them consistently

Browse Source
This commit is contained in:
Kevin Glynn 2011-02-17 11:15:47 +01:00
parent f87cf09735
commit 85b5e57e3c
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/CommonWalker.cs
View File

@ -78,8 +78,13 @@ namespace Twiglet.CS2J.Translator.Transform
} }
// distinguish classes with same name, but differing numbers of type arguments // distinguish classes with same name, but differing numbers of type arguments
protected string mkTypeName (string name, List<String> tyargs) { // Dictionary<K,V> -> Dictionary'2
return name + (tyargs != null && tyargs.Count > 0 ? "'" + tyargs.Count.ToString() : ""); protected string mkGenericTypeAlias (string name, List<String> tyargs) {
return mkGenericTypeAlias(name, tyargs == null ? 0 : tyargs.Count);
}
protected string mkGenericTypeAlias (string name, int tyargCount) {
return name + (tyargCount > 0 ? "'" + tyargCount.ToString() : "");
} }
protected string formatTyargs(List<string> tyargs) { protected string formatTyargs(List<string> tyargs) {
@ -97,6 +102,11 @@ namespace Twiglet.CS2J.Translator.Transform
return buf.ToString(); return buf.ToString();
} }
// Unless empty return current namespace suffixed with "."
protected string NSPrefix(string ns) {
return (String.IsNullOrEmpty(ns) ? "" : ns + ".");
}
} }
// Wraps a compilation unit with its imports search path // Wraps a compilation unit with its imports search path

4
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaMaker.g
View File

@ -876,7 +876,7 @@ attribute_argument_expression:
class_declaration[CommonTree atts, CommonTree mods] returns [string name] class_declaration[CommonTree atts, CommonTree mods] returns [string name]
scope TypeContext; scope TypeContext;
: :
c='class' identifier { $TypeContext::typeName = $identifier.text; } type_parameter_list? { $name = mkTypeName($identifier.text, $type_parameter_list.names); } class_base? type_parameter_constraints_clauses? class_body ';'? c='class' identifier { $TypeContext::typeName = $identifier.text; } type_parameter_list? { $name = mkGenericTypeAlias($identifier.text, $type_parameter_list.names); } class_base? type_parameter_constraints_clauses? class_body ';'?
-> ^(CLASS[$c.Token] { dupTree($atts) } { dupTree($mods) } identifier type_parameter_constraints_clauses? type_parameter_list? class_base? class_body ); -> ^(CLASS[$c.Token] { dupTree($atts) } { dupTree($mods) } identifier type_parameter_constraints_clauses? type_parameter_list? class_base? class_body );
type_parameter_list returns [List<string> names] type_parameter_list returns [List<string> names]
@ -1228,7 +1228,7 @@ interface_accessor_declaration [CommonTree atts, CommonTree mods, CommonTree typ
struct_declaration[CommonTree atts, CommonTree mods] returns [string name] struct_declaration[CommonTree atts, CommonTree mods] returns [string name]
scope TypeContext; scope TypeContext;
: :
c='struct' identifier { $TypeContext::typeName = $identifier.text; } type_parameter_list? { $name = mkTypeName($identifier.text, $type_parameter_list.names); } class_base? type_parameter_constraints_clauses? struct_body[$identifier.text] ';'? c='struct' identifier { $TypeContext::typeName = $identifier.text; } type_parameter_list? { $name = mkGenericTypeAlias($identifier.text, $type_parameter_list.names); } class_base? type_parameter_constraints_clauses? struct_body[$identifier.text] ';'?
-> ^(CLASS[$c.Token, "class"] { dupTree($atts) } { dupTree($mods) } identifier type_parameter_constraints_clauses? type_parameter_list? class_base? struct_body ); -> ^(CLASS[$c.Token, "class"] { dupTree($atts) } { dupTree($mods) } identifier type_parameter_constraints_clauses? type_parameter_list? class_base? struct_body );
struct_body [string structName]: struct_body [string structName]:

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

@ -70,7 +70,7 @@ scope SymTab {
public void AddToImports(string imp) { public void AddToImports(string imp) {
// Don't add import if its namespace is within our type // Don't add import if its namespace is within our type
// if (!imp.StartsWith($NSContext::currentNS+".")) { // if (!imp.StartsWith($NSContext::currentNS+".")) {
if (imp != null && !imp.StartsWith(CompUnitName+".")) { if (imp != null && !imp.StartsWith(NSPrefix(CompUnitName))) {
Imports.Add(imp); Imports.Add(imp);
} }
// } // }

41
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g
View File

@ -85,10 +85,6 @@ scope NSContext {
} }
} }
protected string NSPrefix(string ns) {
return (String.IsNullOrEmpty(ns) ? "" : ns + ".");
}
} }
/******************************************************************************************** /********************************************************************************************
@ -687,18 +683,22 @@ scope NSContext;
'class' type_or_generic 'class' type_or_generic
{ {
Debug("Processing class: " + $type_or_generic.type); Debug("Processing class: " + $type_or_generic.type);
klass.TypeName = NSPrefix(ParentNameSpace) + mkTypeName($type_or_generic.type, $type_or_generic.generic_arguments); // For class System.Dictionary<K,V>
// The Type Rep has TypeName "System.Dictionary", TypeArgs "K","V" is stored at System/Dictionary'2.xml
// and will be used as [System.]Dictionary[Type1,Type2]
String genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias($type_or_generic.type, $type_or_generic.generic_arguments);
klass.TypeName = NSPrefix(ParentNameSpace) + $type_or_generic.type;
if ($type_or_generic.generic_arguments.Count > 0) { if ($type_or_generic.generic_arguments.Count > 0) {
klass.TypeParams = $type_or_generic.generic_arguments.ToArray(); klass.TypeParams = $type_or_generic.generic_arguments.ToArray();
} }
// Nested types can see things in this space // Nested types can see things in this space
$NSContext::searchpath.Add(klass.TypeName); $NSContext::searchpath.Add(genericNameSpace);
$NSContext::currentNS = klass.TypeName; $NSContext::currentNS = genericNameSpace;
$NSContext::currentTypeRep = klass; $NSContext::currentTypeRep = klass;
AppEnv[klass.TypeName] = klass; AppEnv[genericNameSpace] = klass;
klass.Uses = this.CollectUses; klass.Uses = this.CollectUses;
klass.Aliases = this.CollectAliases; klass.Aliases = this.CollectAliases;
klass.Imports = new string[] {NSPrefix(ParentNameSpace) + $type_or_generic.type}; klass.Imports = new string[] {klass.TypeName};
} }
(cb=class_base { klass.Inherits = $cb.typeList.ToArray(); } )? (cb=class_base { klass.Inherits = $cb.typeList.ToArray(); } )?
type_parameter_constraints_clauses? class_body ';'? ; type_parameter_constraints_clauses? class_body ';'? ;
@ -717,7 +717,7 @@ interface_type_list returns [List<string> typeList]
$typeList = new List<string>(); $typeList = new List<string>();
} }
: :
t1=type { typeList.Add($t1.text); } (',' tn=type { typeList.Add($tn.text); } )* ; t1=type { typeList.Add($t1.thetext); } (',' tn=type { typeList.Add($tn.thetext); } )* ;
class_body: class_body:
'{' class_member_declarations? '}' ; '{' class_member_declarations? '}' ;
@ -867,16 +867,17 @@ scope NSContext;
'(' formal_parameter_list? ')' type_parameter_constraints_clauses? ';' '(' formal_parameter_list? ')' type_parameter_constraints_clauses? ';'
{ {
Debug("Processing delegate: " + $identifier.text); Debug("Processing delegate: " + $identifier.text);
dlegate.TypeName = NSPrefix(ParentNameSpace) + mkTypeName($identifier.text, $variant_generic_parameter_list.tyargs); String genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias($identifier.text, $variant_generic_parameter_list.tyargs);
dlegate.TypeName = NSPrefix(ParentNameSpace) + $identifier.text;
if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) { if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) {
dlegate.TypeParams = $variant_generic_parameter_list.tyargs.ToArray(); dlegate.TypeParams = $variant_generic_parameter_list.tyargs.ToArray();
} }
dlegate.Return=$return_type.thetext; dlegate.Return=$return_type.thetext;
dlegate.Params=$formal_parameter_list.paramlist; dlegate.Params=$formal_parameter_list.paramlist;
AppEnv[dlegate.TypeName] = dlegate; AppEnv[genericNameSpace] = dlegate;
dlegate.Uses = this.CollectUses; dlegate.Uses = this.CollectUses;
dlegate.Aliases = this.CollectAliases; dlegate.Aliases = this.CollectAliases;
dlegate.Imports = new string[] {NSPrefix(ParentNameSpace) + $identifier.text}; dlegate.Imports = new string[] {dlegate.TypeName};
} }
; ;
delegate_modifiers: delegate_modifiers:
@ -958,7 +959,8 @@ scope NSContext;
'interface' identifier variant_generic_parameter_list? 'interface' identifier variant_generic_parameter_list?
{ {
Debug("Processing interface: " + $identifier.text); Debug("Processing interface: " + $identifier.text);
iface.TypeName = NSPrefix(ParentNameSpace) + mkTypeName($identifier.text, $variant_generic_parameter_list.tyargs); String genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias($identifier.text, $variant_generic_parameter_list.tyargs);
iface.TypeName = NSPrefix(ParentNameSpace) + $identifier.text;
if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) { if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) {
iface.TypeParams = $variant_generic_parameter_list.tyargs.ToArray(); iface.TypeParams = $variant_generic_parameter_list.tyargs.ToArray();
} }
@ -966,10 +968,10 @@ scope NSContext;
$NSContext::searchpath.Add(iface.TypeName); $NSContext::searchpath.Add(iface.TypeName);
$NSContext::currentNS = iface.TypeName; $NSContext::currentNS = iface.TypeName;
$NSContext::currentTypeRep = iface; $NSContext::currentTypeRep = iface;
AppEnv[iface.TypeName] = iface; AppEnv[genericNameSpace] = iface;
iface.Uses = this.CollectUses; iface.Uses = this.CollectUses;
iface.Aliases = this.CollectAliases; iface.Aliases = this.CollectAliases;
iface.Imports = new string[] {NSPrefix(ParentNameSpace) + $identifier.text}; iface.Imports = new string[] {iface.TypeName};
} }
(interface_base { iface.Inherits = $interface_base.typeList.ToArray(); } )? (interface_base { iface.Inherits = $interface_base.typeList.ToArray(); } )?
type_parameter_constraints_clauses? interface_body ';'? ; type_parameter_constraints_clauses? interface_body ';'? ;
@ -1045,7 +1047,8 @@ scope NSContext;
'struct' type_or_generic 'struct' type_or_generic
{ {
Debug("Processing struct: " + $type_or_generic.type); Debug("Processing struct: " + $type_or_generic.type);
strukt.TypeName = NSPrefix(ParentNameSpace) + mkTypeName($type_or_generic.type, $type_or_generic.generic_arguments); String genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias($type_or_generic.type, $type_or_generic.generic_arguments);
strukt.TypeName = NSPrefix(ParentNameSpace) + $type_or_generic.type;
if ($type_or_generic.generic_arguments.Count > 0) { if ($type_or_generic.generic_arguments.Count > 0) {
strukt.TypeParams = $type_or_generic.generic_arguments.ToArray(); strukt.TypeParams = $type_or_generic.generic_arguments.ToArray();
} }
@ -1053,10 +1056,10 @@ scope NSContext;
$NSContext::searchpath.Add(strukt.TypeName); $NSContext::searchpath.Add(strukt.TypeName);
$NSContext::currentNS = strukt.TypeName; $NSContext::currentNS = strukt.TypeName;
$NSContext::currentTypeRep = strukt; $NSContext::currentTypeRep = strukt;
AppEnv[strukt.TypeName] = strukt; AppEnv[genericNameSpace] = strukt;
strukt.Uses = this.CollectUses; strukt.Uses = this.CollectUses;
strukt.Aliases = this.CollectAliases; strukt.Aliases = this.CollectAliases;
strukt.Imports = new string[] {NSPrefix(ParentNameSpace) + $type_or_generic.type}; strukt.Imports = new string[] {strukt.TypeName};
} (si=struct_interfaces { strukt.Inherits = $si.typeList.ToArray(); })? } (si=struct_interfaces { strukt.Inherits = $si.typeList.ToArray(); })?
type_parameter_constraints_clauses? struct_body ';'? ; type_parameter_constraints_clauses? struct_body ';'? ;
struct_modifiers: struct_modifiers: