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

NEW -> NEW, NEW_ARRAY, NEW_DELEGATE, NEW_ANON_OBJECT

Browse Source 
replace var and dynamic by imaginary nodes TYPE_VAR and TYPE_DYNAMIC
This commit is contained in:
Kevin Glynn 2011-03-14 17:00:08 +01:00
parent 2b87e38000
commit f92d26412d
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,10 +474,10 @@ dim_separators
delegate_creation_expression: delegate_creation_expression:
// 'new' // 'new'
t1=type_name '(' t2=type_name ')' -> ^(NEW[$t1.start.Token, "new"] ^(TYPE[$t1.start.Token, "TYPE"] $t1) ^(ARGS[$t2.start.Token, "ARGS"] $t2)); t1=type_name '(' t2=type_name ')' -> ^(NEW_DELEGATE[$t1.start.Token, "new(delegate)"] ^(TYPE[$t1.start.Token, "TYPE"] $t1) ^(ARGS[$t2.start.Token, "ARGS"] $t2));
anonymous_object_creation_expression: anonymous_object_creation_expression:
// 'new' // 'new'
anonymous_object_initializer ; i=anonymous_object_initializer -> ^(NEW_ANON_OBJECT[$i.tree.Token, "new(anonobj)"] anonymous_object_initializer);
anonymous_object_initializer: anonymous_object_initializer:
'{' (member_declarator_list ','?)? '}'; '{' (member_declarator_list ','?)? '}';
member_declarator_list: member_declarator_list:
@ -515,7 +515,7 @@ array_creation_expression
} }
} }
}: }:
n=NEWARRAY n=NEW_ARRAY
(type ((o='[' expression_list c=']' -> ^($n type $o expression_list $c)) { ret = (CommonTree)adaptor.RulePostProcessing($array_creation_expression.tree); } (type ((o='[' expression_list c=']' -> ^($n type $o expression_list $c)) { ret = (CommonTree)adaptor.RulePostProcessing($array_creation_expression.tree); }
( (rank_specifiers { adaptor.AddChild(ret, $rank_specifiers.tree); })? ( (rank_specifiers { adaptor.AddChild(ret, $rank_specifiers.tree); })?
(ai1=array_initializer { adaptor.AddChild(ret, $ai1.tree); (ai1=array_initializer { adaptor.AddChild(ret, $ai1.tree);
@ -1402,8 +1402,8 @@ declaration_statement:
local_variable_declaration returns [List<string> variableNames]: local_variable_declaration returns [List<string> variableNames]:
local_variable_type local_variable_declarators { $variableNames = $local_variable_declarators.variableNames; }; local_variable_type local_variable_declarators { $variableNames = $local_variable_declarators.variableNames; };
local_variable_type: local_variable_type:
('var') => 'var' ('var') => v='var' -> TYPE_VAR[$v.token, "var"]
| ('dynamic') => 'dynamic' | ('dynamic') => d='dynamic' -> TYPE_DYNAMIC[$d.token,"dynamic"]
| type ; | type ;
local_variable_declarators returns [List<string> variableNames] local_variable_declarators returns [List<string> variableNames]
@init { @init {

13
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/JavaPrettyPrint.g
View File

@ -375,11 +375,8 @@ primary_expression returns [int precedence]
// | ('base' brackets) => 'this' brackets primary_expression_part* // | ('base' brackets) => 'this' brackets primary_expression_part*
// | primary_expression_start primary_expression_part* // | primary_expression_start primary_expression_part*
| ^(NEW type argument_list? object_or_collection_initializer?) { $precedence = precedence[NEW]; }-> construct(type = {$type.st}, args = {$argument_list.st}, inits = {$object_or_collection_initializer.st}) | ^(NEW type argument_list? object_or_collection_initializer?) { $precedence = precedence[NEW]; }-> construct(type = {$type.st}, args = {$argument_list.st}, inits = {$object_or_collection_initializer.st})
| 'new' ( | ^(NEW_DELEGATE delegate_creation_expression) // new FooDelegate (MyFunction)
// (try the simple one first, this has no argS and no expressions | ^(NEW_ANON_OBJECT anonymous_object_creation_expression) // new {int X, string Y}
// symantically could be object creation)
| (delegate_creation_expression) => delegate_creation_expression // new FooDelegate (MyFunction)
| anonymous_object_creation_expression) // new {int X, string Y}
| sizeof_expression // sizeof (struct) | sizeof_expression // sizeof (struct)
| checked_expression -> { $checked_expression.st } // checked (... | checked_expression -> { $checked_expression.st } // checked (...
| unchecked_expression -> { $unchecked_expression.st } // unchecked {...} | unchecked_expression -> { $unchecked_expression.st } // unchecked {...}
@ -503,7 +500,7 @@ primary_or_array_creation_expression returns [int precedence]:
; ;
// new Type[2] { } // new Type[2] { }
array_creation_expression returns [int precedence]: array_creation_expression returns [int precedence]:
^(NEWARRAY ^(NEW_ARRAY
(type ('[' expression_list ']' (type ('[' expression_list ']'
( rank_specifiers? ai1=array_initializer? -> array_construct(type = { $type.st }, args = { $expression_list.st }, inits = { $ai1.st }) // new int[4] ( rank_specifiers? ai1=array_initializer? -> array_construct(type = { $type.st }, args = { $expression_list.st }, inits = { $ai1.st }) // new int[4]
// | invocation_part* // | invocation_part*
@ -1231,8 +1228,8 @@ declaration_statement
local_variable_declaration: local_variable_declaration:
local_variable_type local_variable_declarators -> local_variable_declaration(type={ $local_variable_type.st }, decs = { $local_variable_declarators.st } ); local_variable_type local_variable_declarators -> local_variable_declaration(type={ $local_variable_type.st }, decs = { $local_variable_declarators.st } );
local_variable_type: local_variable_type:
('var') => 'var' -> unsupported(reason = {"'var' as type is unsupported"}, text = { "var" } ) TYPE_VAR -> unsupported(reason = {"'var' as type is unsupported"}, text = { "var" } )
| ('dynamic') => 'dynamic' -> unsupported(reason = {"'dynamic' as type is unsupported"}, text = { "dynamic" } ) | TYPE_DYNAMIC -> unsupported(reason = {"'dynamic' as type is unsupported"}, text = { "dynamic" } )
| type -> { $type.st } ; | type -> { $type.st } ;
local_variable_declarators: local_variable_declarators:
vs+=local_variable_declarator (',' vs+=local_variable_declarator)* -> list(items={$vs}, sep={", "}); vs+=local_variable_declarator (',' vs+=local_variable_declarator)* -> list(items={$vs}, sep={", "});

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

@ -767,11 +767,8 @@ scope {
WarningFailedResolve($n.token.Line, "Could not resolve constructor against " + conType.TypeName); WarningFailedResolve($n.token.Line, "Could not resolve constructor against " + conType.TypeName);
} }
} }
| 'new' ( | ^(NEW_DELEGATE delegate_creation_expression) // new FooDelegate (MyFunction)
// (try the simple one first, this has no argS and no expressions | ^(NEW_ANON_OBJECT anonymous_object_creation_expression) // new {int X, string Y}
// symantically could be object creation)
| (delegate_creation_expression) => delegate_creation_expression // new FooDelegate (MyFunction)
| anonymous_object_creation_expression) // new {int X, string Y}
| sizeof_expression // sizeof (struct) | sizeof_expression // sizeof (struct)
| checked_expression // checked (... | checked_expression // checked (...
| unchecked_expression // unchecked {...} | unchecked_expression // unchecked {...}
@ -856,7 +853,7 @@ primary_or_array_creation_expression returns [TypeRepTemplate dotNetType, string
; ;
// new Type[2] { } // new Type[2] { }
array_creation_expression returns [TypeRepTemplate dotNetType]: array_creation_expression returns [TypeRepTemplate dotNetType]:
^(NEWARRAY ^(NEW_ARRAY
(type ('[' expression_list ']' (type ('[' expression_list ']'
( rank_specifiers[$type.dotNetType]? array_initializer? // new int[4] ( rank_specifiers[$type.dotNetType]? array_initializer? // new int[4]
// | invocation_part* // | invocation_part*
@ -2014,8 +2011,8 @@ local_variable_type returns [bool isTypeNode, TypeRepTemplate dotNetType]
@init { @init {
$isTypeNode = false; $isTypeNode = false;
}: }:
('var') => 'var' { $dotNetType = new UnknownRepTemplate("System.Object"); } TYPE_VAR { $dotNetType = new UnknownRepTemplate("System.Object"); }
| ('dynamic') => 'dynamic' { $dotNetType = new UnknownRepTemplate("System.Object"); } | TYPE_DYNAMIC { $dotNetType = new UnknownRepTemplate("System.Object"); }
| type { $dotNetType = $type.dotNetType; $isTypeNode = true; }; | type { $dotNetType = $type.dotNetType; $isTypeNode = true; };
local_variable_declarators[CommonTree tyTree, TypeRepTemplate ty]: local_variable_declarators[CommonTree tyTree, TypeRepTemplate ty]:
local_variable_declarator[$tyTree, $ty] (',' local_variable_declarator[$tyTree, $ty])* ; local_variable_declarator[$tyTree, $ty] (',' local_variable_declarator[$tyTree, $ty])* ;

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

@ -303,7 +303,7 @@ primary_or_array_creation_expression:
; ;
// new Type[2] { } // new Type[2] { }
array_creation_expression: array_creation_expression:
NEWARRAY NEW_ARRAY
(type ('[' expression_list ']' (type ('[' expression_list ']'
( rank_specifiers? array_initializer? // new int[4] ( rank_specifiers? array_initializer? // new int[4]
// | invocation_part* // | invocation_part*

8
CSharpTranslator/antlr3/src/CSharpParser/cs.g
View File

@ -48,7 +48,9 @@ tokens {
APPLY; APPLY;
ARGS; ARGS;
NEW; NEW;
NEWARRAY; NEW_ARRAY;
NEW_DELEGATE;
NEW_ANON_OBJECT;
STATIC_CONSTRUCTOR; STATIC_CONSTRUCTOR;
RETURN = 'return'; RETURN = 'return';
@ -123,6 +125,8 @@ tokens {
STAR = '*'; STAR = '*';
TYPE; TYPE;
TYPE_VAR;
TYPE_DYNAMIC;
ENUM_BODY; ENUM_BODY;
TYPE_PARAM_CONSTRAINT; TYPE_PARAM_CONSTRAINT;
UNARY_EXPR; UNARY_EXPR;
@ -359,7 +363,7 @@ public array_creation_expression:
) )
) ; ) ;
public new_array: public new_array:
n='new' -> NEWARRAY[$n, "newarray"]; n='new' -> NEW_ARRAY[$n, "newarray"];
public array_initializer: public array_initializer:
'{' variable_initializer_list? ','? '}' ; '{' variable_initializer_list? ','? '}' ;
public variable_initializer_list: public variable_initializer_list: