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

support for static property members

Browse Source
This commit is contained in:
Kevin Glynn 2011-01-13 14:39:50 +01:00
parent 892d1c17e2
commit 882110a8ef
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CSharpTranslator/antlr3/src/cs2j/CSharp/NetMaker.g
View File

@ -240,9 +240,14 @@ scope {
| SUPER { $dotNetType = SymTabLookup("super"); } | SUPER { $dotNetType = SymTabLookup("super"); }
| i=identifier | i=identifier
{ {
bool found = false;
TypeRepTemplate idType = SymTabLookup($identifier.thetext); TypeRepTemplate idType = SymTabLookup($identifier.thetext);
if (idType == null) { if (idType != null) {
// Not a variable $dotNetType = idType;
found = true;
}
if (!found) {
// Not a variable, is it a property?
InterfaceRepTemplate thisType = SymTabLookup("this") as InterfaceRepTemplate; InterfaceRepTemplate thisType = SymTabLookup("this") as InterfaceRepTemplate;
// Is it a property read? Ensure we are not being applied to arguments or about to be assigned // Is it a property read? Ensure we are not being applied to arguments or about to be assigned
@ -256,11 +261,17 @@ scope {
Debug($identifier.tree.Token.Line + ": Found '" + $identifier.thetext + "'"); Debug($identifier.tree.Token.Line + ": Found '" + $identifier.thetext + "'");
ret = mkJavaWrapper(fieldResult.Result.Java, null, $i.tree.Token); ret = mkJavaWrapper(fieldResult.Result.Java, null, $i.tree.Token);
$dotNetType = fieldResult.ResultType; $dotNetType = fieldResult.ResultType;
found = true;
} }
} }
} }
else { if (!found) {
$dotNetType = idType; // Not a variable, not a property read, is it a type name?
TypeRepTemplate staticType = findType($i.thetext);
if (staticType != null) {
$dotNetType = staticType;
found = true;
}
} }
} }
| primary_expression_start | primary_expression_start
@ -551,7 +562,10 @@ scope {
@init { @init {
$assignment::parentIsSetter = true; $assignment::parentIsSetter = true;
}: }:
unary_expression assignment_operator {$assignment::parentIsSetter = false; } expression ; (^('.' expression identifier generic_argument_list?) | identifier) => (^('.' expression identifier generic_argument_list?) | identifier) assignment_operator {$assignment::parentIsSetter = false; } expression
| unary_expression assignment_operator {$assignment::parentIsSetter = false; } expression ;
unary_expression returns [TypeRepTemplate dotNetType]: unary_expression returns [TypeRepTemplate dotNetType]:
//('(' arguments ')' ('[' | '.' | '(')) => primary_or_array_creation_expression //('(' arguments ')' ('[' | '.' | '(')) => primary_or_array_creation_expression