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

Convert nullable types to their boxed equivalent (and print warning)

Browse Source
This commit is contained in:
Kevin Glynn 2013-03-01 12:52:21 +01:00
parent aa1bba52fc
commit b38a1a6db0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1982,6 +1982,7 @@ type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees, CommonTree
@ init { @ init {
bool hasRank = false; bool hasRank = false;
bool isPredefined = false; bool isPredefined = false;
bool isNullable = false;
CommonTree pTree = null; CommonTree pTree = null;
} }
@after { @after {
@ -2000,7 +2001,7 @@ type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees, CommonTree
^(t=TYPE (p=predefined_type { isPredefined = true; $dotNetType = $predefined_type.dotNetType; pTree = $p.tree; } ^(t=TYPE (p=predefined_type { isPredefined = true; $dotNetType = $predefined_type.dotNetType; pTree = $p.tree; }
| type_name { $dotNetType = $type_name.dotNetType; $argTrees = $type_name.argTrees; } | type_name { $dotNetType = $type_name.dotNetType; $argTrees = $type_name.argTrees; }
| 'void' { $dotNetType = VoidType; } ) | 'void' { $dotNetType = VoidType; } )
(rank_specifiers[$dotNetType] { isPredefined = false; $dotNetType = $rank_specifiers.dotNetType; $argTrees = null; hasRank = true; })? '*'* '?'?) (rank_specifiers[$dotNetType] { isPredefined = false; $dotNetType = $rank_specifiers.dotNetType; $argTrees = null; hasRank = true; })? '*'* ('?' { isNullable = true; })?)
magicBoxedType[$dotNetType != null && $dotNetType.HasBoxedRep, $t.token, $dotNetType == null ? "" : $dotNetType.BoxedJava] magicBoxedType[$dotNetType != null && $dotNetType.HasBoxedRep, $t.token, $dotNetType == null ? "" : $dotNetType.BoxedJava]
{ {
if (isPredefined) { if (isPredefined) {
@ -2009,8 +2010,11 @@ type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees, CommonTree
if ($magicBoxedType.tree != null) { if ($magicBoxedType.tree != null) {
$boxedTree = $magicBoxedType.tree; $boxedTree = $magicBoxedType.tree;
} }
if (isNullable) {
Warning(t.Line, "[UNSUPPORTED] We convert Nullable types to Boxed types. Operators on null values will throw exceptions rather than preserving NULL.");
}
} }
-> { $PrimitiveRep::primitiveTypeAsObject && !hasRank && $dotNetType.HasBoxedRep && !String.IsNullOrEmpty($dotNetType.BoxedJava) }? ^(TYPE[$t.token, "TYPE"] IDENTIFIER[$t.token,$dotNetType.BoxedJava] '*'* '?'?) -> { (isNullable || $PrimitiveRep::primitiveTypeAsObject) && !hasRank && $dotNetType.HasBoxedRep && !String.IsNullOrEmpty($dotNetType.BoxedJava) }? ^(TYPE[$t.token, "TYPE"] IDENTIFIER[$t.token,$dotNetType.BoxedJava] '*'*)
-> ^(TYPE[$t.token, "TYPE"] predefined_type? type_name? 'void'? rank_specifiers? '*'* '?'?) -> ^(TYPE[$t.token, "TYPE"] predefined_type? type_name? 'void'? rank_specifiers? '*'* '?'?)
; ;