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

(Closes GH-5): If we are in the context of a generic type argument then generate Object Type equivalents, instead of primitive types

Browse Source
This commit is contained in:
Kevin Glynn 2011-03-04 11:29:53 +01:00
parent f1b125aa6f
commit 7295a5df93
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,11 @@ scope SymTab {
Dictionary<string,TypeRepTemplate> symtab; Dictionary<string,TypeRepTemplate> symtab;
} }
// When this scope is true, then generate equivalent Object types instead of primitive types
scope PrimitiveRep {
bool primitiveTypeAsObject;
}
@namespace { Twiglet.CS2J.Translator.Transform } @namespace { Twiglet.CS2J.Translator.Transform }
@header @header
@ -183,6 +188,20 @@ scope SymTab {
} }
} }
// Map of Java built in types to their object based equivalents
Dictionary<string, string> primitive_to_object_type_map = new Dictionary<string, string>()
{
{"byte", "Byte"},
{"short", "Short"},
{"int", "Integer"},
{"long", "Long"},
{"float", "Float"},
{"double", "Double"},
{"boolean", "Boolean"},
{"char", "Character"}
};
protected TypeRepTemplate SymTabLookup(string name) { protected TypeRepTemplate SymTabLookup(string name) {
return SymTabLookup(name, null); return SymTabLookup(name, null);
} }
@ -444,11 +463,13 @@ scope SymTab {
} }
public compilation_unit public compilation_unit
scope NSContext; scope NSContext, PrimitiveRep;
@init { @init {
Imports = new Set<string>(); Imports = new Set<string>();
$PrimitiveRep::primitiveTypeAsObject = false;
// TODO: Do we need to ensure we have access to System? If so, can add it here. // TODO: Do we need to ensure we have access to System? If so, can add it here.
$NSContext::namespaces = SearchPath ?? new List<string>(); $NSContext::namespaces = SearchPath ?? new List<string>();
$NSContext::globalNamespaces = SearchPath ?? new List<string>(); $NSContext::globalNamespaces = SearchPath ?? new List<string>();
@ -1018,7 +1039,9 @@ 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;
@init { @init {
$PrimitiveRep::primitiveTypeAsObject = true;
$tyTypes = new List<TypeRepTemplate>(); $tyTypes = new List<TypeRepTemplate>();
$argTrees = new List<CommonTree>(); $argTrees = new List<CommonTree>();
}: }:
@ -2133,6 +2156,12 @@ predefined_type returns [TypeRepTemplate dotNetType]
@after { @after {
$dotNetType = new ClassRepTemplate((ClassRepTemplate)AppEnv.Search(ns)); $dotNetType = new ClassRepTemplate((ClassRepTemplate)AppEnv.Search(ns));
$dotNetType.IsUnboxedType = true; $dotNetType.IsUnboxedType = true;
// In certain contexts we must translate primitive types into their object based equivalent
string newText;
if ($PrimitiveRep::primitiveTypeAsObject && primitive_to_object_type_map.TryGetValue($predefined_type.tree.Token.Text, out newText)) {
$predefined_type.tree.Token.Text = newText;
}
}: }:
'bool' { ns = "System.Boolean"; } 'bool' { ns = "System.Boolean"; }
| 'byte' { ns = "System.Byte"; } | 'byte' { ns = "System.Byte"; }