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

type argument to instanceof cannot be primitive. Arrays are not primitive

Browse Source
This commit is contained in:
Kevin Glynn 2011-04-19 10:23:11 +02:00
parent 830987e80a
commit 0529896ca2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1120,11 +1120,17 @@ scope PrimitiveRep;
// keving: TODO: Look for type vars // keving: TODO: Look for type vars
type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees] type returns [TypeRepTemplate dotNetType, List<CommonTree> argTrees]
@ init {
bool hasRank = false;
}
: :
^(TYPE (predefined_type { $dotNetType = $predefined_type.dotNetType; } ^(TYPE (p=predefined_type { $dotNetType = $predefined_type.dotNetType; }
| type_name { $dotNetType = $type_name.dotNetType; $argTrees = $type_name.argTrees; } | type_name { $dotNetType = $type_name.dotNetType; $argTrees = $type_name.argTrees; }
| 'void' { $dotNetType = AppEnv["System.Void"]; } ) | 'void' { $dotNetType = AppEnv["System.Void"]; } )
(rank_specifiers[$dotNetType] { $dotNetType = $rank_specifiers.dotNetType; $argTrees = null; })? '*'* '?'?); (rank_specifiers[$dotNetType] { $dotNetType = $rank_specifiers.dotNetType; $argTrees = null; hasRank = true; })? '*'* '?'?)
-> { $PrimitiveRep::primitiveTypeAsObject && $p.tree != null && !hasRank && !String.IsNullOrEmpty($dotNetType.BoxedName) }? ^(TYPE IDENTIFIER[$p.tree.Token,$dotNetType.BoxedName] '*'* '?'?)
-> ^(TYPE predefined_type? type_name? 'void'? rank_specifiers? '*'* '?'?)
;
non_nullable_type returns [TypeRepTemplate dotNetType]: non_nullable_type returns [TypeRepTemplate dotNetType]:
type { $dotNetType = $type.dotNetType; } ; type { $dotNetType = $type.dotNetType; } ;
@ -1361,9 +1367,10 @@ shortcut_assignment_operator: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '
// '&' unary_expression ; // '&' unary_expression ;
non_assignment_expression returns [TypeRepTemplate dotNetType, string rmId, TypeRepTemplate typeofType, string thedottedtext] non_assignment_expression returns [TypeRepTemplate dotNetType, string rmId, TypeRepTemplate typeofType, string thedottedtext]
scope MkNonGeneric; scope MkNonGeneric, PrimitiveRep;
@init { @init {
$MkNonGeneric::scrubGenericArgs = false; $MkNonGeneric::scrubGenericArgs = false;
$PrimitiveRep::primitiveTypeAsObject = false;
bool nullArg = false; bool nullArg = false;
bool stringArgs = false; bool stringArgs = false;
bool dateArgs = false; bool dateArgs = false;
@ -1493,7 +1500,7 @@ scope MkNonGeneric;
-> {dateArgs}? -> {dateArgs}?
$ople $ople
->^($le $le1 $le2) ->^($le $le1 $le2)
| ^(INSTANCEOF non_assignment_expression { $MkNonGeneric::scrubGenericArgs = true; } non_nullable_type) {$dotNetType = BoolType; } | ^(INSTANCEOF non_assignment_expression { $MkNonGeneric::scrubGenericArgs = true; $PrimitiveRep::primitiveTypeAsObject = true; } non_nullable_type) {$dotNetType = BoolType; }
| ^('<<' n7=non_assignment_expression non_assignment_expression) {$dotNetType = $n7.dotNetType; } | ^('<<' n7=non_assignment_expression non_assignment_expression) {$dotNetType = $n7.dotNetType; }
| ^(RIGHT_SHIFT n8=non_assignment_expression non_assignment_expression) {$dotNetType = $n8.dotNetType; } | ^(RIGHT_SHIFT n8=non_assignment_expression non_assignment_expression) {$dotNetType = $n8.dotNetType; }
// TODO: need to munge these numeric types // TODO: need to munge these numeric types
@ -2311,10 +2318,6 @@ predefined_type returns [TypeRepTemplate dotNetType]
if (primitive_to_object_type_map.TryGetValue($predefined_type.tree.Token.Text, out newText)) if (primitive_to_object_type_map.TryGetValue($predefined_type.tree.Token.Text, out newText))
$dotNetType.BoxedName = newText; $dotNetType.BoxedName = newText;
// In certain contexts we must translate primitive types into their object based equivalent
if ($PrimitiveRep::primitiveTypeAsObject && newText != null) {
$predefined_type.tree.Token.Text = newText;
}
}: }:
'bool' { ns = "System.Boolean"; } 'bool' { ns = "System.Boolean"; }
| 'byte' { ns = "System.Byte"; } | 'byte' { ns = "System.Byte"; }