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

fix for throw without argument (use var from current catch context)

Browse Source
This commit is contained in:
Kevin Glynn 2010-12-13 09:58:43 +01:00
parent 16dad136d8
commit 77ee05660f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CSharpTranslator/antlr3/src/cs2j/CSharp/JavaMaker.g
View File

@ -100,6 +100,10 @@ scope NSContext {
// counter to ensure that the catch vars we introduce are unique // counter to ensure that the catch vars we introduce are unique
protected int dummyCatchVarCtr = 0; protected int dummyCatchVarCtr = 0;
protected CommonTree dupTree(CommonTree t) {
return (CommonTree)adaptor.DupTree(t);
}
} }
/******************************************************************************************** /********************************************************************************************
@ -1192,8 +1196,13 @@ goto_statement:
| 'default') ';' ; | 'default') ';' ;
return_statement: return_statement:
'return'^ expression? ';'! ; 'return'^ expression? ';'! ;
throw_statement: throw_statement
'throw'^ expression? ';'! ; // If throw exp is missing then it is the var from closest enclosing catch
@init {
CommonTree var = null;
bool missingThrowExp = true;
}:
t='throw' (e=expression { missingThrowExp = false;})? { var = missingThrowExp ? dupTree($catch_clause::throwVar) : $e.tree; } ';' -> ^($t { var });
try_statement: try_statement:
t='try' block ( catch_clauses finally_clause? t='try' block ( catch_clauses finally_clause?
| finally_clause) -> ^($t block catch_clauses? finally_clause?); | finally_clause) -> ^($t block catch_clauses? finally_clause?);
@ -1202,11 +1211,12 @@ try_statement:
catch_clauses: catch_clauses:
catch_clause+; catch_clause+;
catch_clause catch_clause
scope { CommonTree throwVar; }
@init { @init {
CommonTree ty = null, var = null; CommonTree ty = null, var = null;
}: }:
c='catch' ('(' given_t=class_type { ty = $given_t.tree; } (given_v=identifier { var = $given_v.tree; } | magic_v=magicCatchVar { var = $magic_v.tree; } ) ')' c='catch' ('(' given_t=class_type { ty = $given_t.tree; } (given_v=identifier { var = $given_v.tree; } | magic_v=magicCatchVar { var = $magic_v.tree; } ) ')'
| magic_t=magicThrowableType magic_v=magicCatchVar { ty = $magic_t.tree; var = $magic_v.tree; }) block | magic_t=magicThrowableType magic_v=magicCatchVar { ty = $magic_t.tree; var = $magic_v.tree; }) { $catch_clause::throwVar = var; } block
-> ^($c { ty } { var } block) -> ^($c { ty } { var } block)
; ;
finally_clause: finally_clause: