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

argument_list argument to JAVAWRAPPERARGUMENTLIST is optional

Browse Source
This commit is contained in:
Kevin Glynn 2011-09-11 17:14:59 +02:00
parent aefe0f98c2
commit c0c2fe6a1a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -766,7 +766,7 @@ wrapped returns [int precedence, IList<StringTemplate> ppArgs]
}:
^(JAVAWRAPPEREXPRESSION expression) { $precedence = $expression.precedence; } -> { $expression.st }
| ^(JAVAWRAPPERARGUMENT argument_value) { $precedence = $argument_value.precedence; } -> { $argument_value.st }
| ^(JAVAWRAPPERARGUMENTLIST argument_list) { $ppArgs = $argument_list.ppArgs; } -> { $argument_list.st }
| ^(JAVAWRAPPERARGUMENTLIST (argument_list { $ppArgs = $argument_list.ppArgs; })?) -> { $argument_list.st }
| ^(JAVAWRAPPERTYPE type) -> { $type.st }
| ^(JAVAWRAPPER t=identifier
(k=identifier v=wrapped

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

@ -256,7 +256,7 @@ scope MkNonGeneric {
protected CommonTree wrapExpression(CommonTree e, IToken tok) {
CommonTree root = (CommonTree)adaptor.Nil;
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPEREXPRESSION, tok, "EXPRESSION"), root);
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPEREXPRESSION, tok, "JAVAWRAPPEREXPRESSION"), root);
adaptor.AddChild(root, dupTree(e));
return (CommonTree)adaptor.RulePostProcessing(root);
@ -264,7 +264,7 @@ scope MkNonGeneric {
protected CommonTree wrapArgument(CommonTree e, IToken tok) {
CommonTree root = (CommonTree)adaptor.Nil;
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPERARGUMENT, tok, "ARGUMENT"), root);
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPERARGUMENT, tok, "JAVAWRAPPERARGUMENT"), root);
adaptor.AddChild(root, dupTree(e));
return (CommonTree)adaptor.RulePostProcessing(root);
@ -272,13 +272,16 @@ scope MkNonGeneric {
protected CommonTree wrapArgumentList(CommonTree e, IToken tok) {
CommonTree root = (CommonTree)adaptor.Nil;
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPERARGUMENTLIST, tok, "ARGUMENTLIST"), root);
root = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(JAVAWRAPPERARGUMENTLIST, tok, "JAVAWRAPPERARGUMENTLIST"), root);
adaptor.AddChild(root, dupTree(e));
return (CommonTree)adaptor.RulePostProcessing(root);
}
protected CommonTree mkArgumentList(CommonTree e1, IToken tok) {
if (adaptor.IsNil(e1))
return e1;
CommonTree argList = (CommonTree)adaptor.Nil;
argList = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(ARGS, tok, "ARGS"), argList);
adaptor.AddChild(argList, dupTree(e1));
@ -297,6 +300,9 @@ scope MkNonGeneric {
protected CommonTree mkArgumentList(IToken tok, params CommonTree[] es) {
CommonTree argList = (CommonTree)adaptor.Nil;
if (es == null || es.Length == 0)
return argList;
argList = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(ARGS, tok, "ARGS"), argList);
if (es != null) {
foreach (CommonTree e in es) {
@ -308,6 +314,9 @@ scope MkNonGeneric {
protected CommonTree mkArgumentList(IToken tok, IList<CommonTree> es) {
CommonTree argList = (CommonTree)adaptor.Nil;
if (es == null || es.Count == 0)
return argList;
argList = (CommonTree)adaptor.BecomeRoot((CommonTree)adaptor.Create(ARGS, tok, "ARGS"), argList);
if (es != null) {
foreach (CommonTree e in es) {