ironservices/ironjava
2
0
Fork 0
Code Issues Packages Releases Wiki

Hot Fix: nestedclasses

Browse Source 
resolved empty nestedclasses
This commit is contained in:
David H. Friedel Jr.
2025-07-23 06:10:17 -04:00
parent 0955bb39e3
commit aae6087f90
4 changed files with 284 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
IronJava.Core/AST/Builders/AstBuilder.cs
View File

@@ -196,12 +196,12 @@ namespace MarketAlly.IronJava.Core.AST.Builders
var typeParameters = BuildTypeParameters(context.typeParameters());
var superClass = context.superclass() != null ? BuildTypeReference(context.superclass().classType()) : null;
var interfaces = BuildInterfaces(context.superinterfaces());
var members = BuildClassMembers(context.classBody());
var bodyResult = BuildClassBody(context.classBody());
var javaDoc = ExtractJavaDoc(context);
return new ClassDeclaration(
location, name, modifiers, annotations, typeParameters,
superClass, interfaces, members, new List<TypeDeclaration>(), javaDoc, false
superClass, interfaces, bodyResult.Members, bodyResult.NestedTypes, javaDoc, false
);
}
@@ -213,12 +213,12 @@ namespace MarketAlly.IronJava.Core.AST.Builders
var name = context.identifier().GetText();
var typeParameters = BuildTypeParameters(context.typeParameters());
var extendedInterfaces = BuildExtendedInterfaces(context.extendsInterfaces());
var members = BuildInterfaceMembers(context.interfaceBody());
var bodyResult = BuildInterfaceBody(context.interfaceBody());
var javaDoc = ExtractJavaDoc(context);
return new InterfaceDeclaration(
location, name, modifiers, annotations, typeParameters,
extendedInterfaces, members, new List<TypeDeclaration>(), javaDoc
extendedInterfaces, bodyResult.Members, bodyResult.NestedTypes, javaDoc
);
}
@@ -231,12 +231,15 @@ namespace MarketAlly.IronJava.Core.AST.Builders
var interfaces = BuildInterfaces(context.superinterfaces());
var enumBody = context.enumBody();
var constants = BuildEnumConstants(enumBody.enumConstantList());
var members = BuildEnumMembers(enumBody.enumBodyDeclarations());
var bodyResult = BuildEnumBody(enumBody.enumBodyDeclarations());
var javaDoc = ExtractJavaDoc(context);
return new EnumDeclaration(
location, name, modifiers, annotations,
interfaces, constants, members, new List<TypeDeclaration>(), javaDoc
interfaces, constants,
bodyResult?.Members ?? new List<MemberDeclaration>(),
bodyResult?.NestedTypes ?? new List<TypeDeclaration>(),
javaDoc
);
}
@@ -249,6 +252,7 @@ namespace MarketAlly.IronJava.Core.AST.Builders
var members = BuildAnnotationMembers(context.annotationTypeBody());
var javaDoc = ExtractJavaDoc(context);
// Annotations don't support nested types in Java
return new AnnotationDeclaration(
location, name, modifiers, annotations, members, new List<TypeDeclaration>(), javaDoc
);
@@ -667,6 +671,54 @@ namespace MarketAlly.IronJava.Core.AST.Builders
return members;
}
private ClassBodyResult BuildClassBody(Java9Parser.ClassBodyContext context)
{
var result = new ClassBodyResult();
foreach (var declaration in context.classBodyDeclaration())
{
if (declaration.classMemberDeclaration() != null)
{
var classMemberContext = declaration.classMemberDeclaration();
// Check if it's a nested type declaration
if (classMemberContext.classDeclaration() != null)
{
var nestedType = Visit(classMemberContext.classDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
else if (classMemberContext.interfaceDeclaration() != null)
{
var nestedType = Visit(classMemberContext.interfaceDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
else
{
// It's a regular member (field or method)
var member = BuildClassMember(classMemberContext);
if (member != null) result.Members.Add(member);
}
}
else if (declaration.instanceInitializer() != null)
{
var initializer = BuildInstanceInitializer(declaration.instanceInitializer());
if (initializer != null) result.Members.Add(initializer);
}
else if (declaration.staticInitializer() != null)
{
var initializer = BuildStaticInitializer(declaration.staticInitializer());
if (initializer != null) result.Members.Add(initializer);
}
else if (declaration.constructorDeclaration() != null)
{
var constructor = BuildConstructor(declaration.constructorDeclaration());
if (constructor != null) result.Members.Add(constructor);
}
}
return result;
}
private MemberDeclaration? BuildClassMember(Java9Parser.ClassMemberDeclarationContext context)
{
if (context.fieldDeclaration() != null)
@@ -677,15 +729,8 @@ namespace MarketAlly.IronJava.Core.AST.Builders
{
return BuildMethodDeclaration(context.methodDeclaration());
}
else if (context.classDeclaration() != null)
{
return Visit(context.classDeclaration()) as MemberDeclaration;
}
else if (context.interfaceDeclaration() != null)
{
return Visit(context.interfaceDeclaration()) as MemberDeclaration;
}
// Nested types are now handled in BuildClassBody
return null;
}
@@ -1040,6 +1085,37 @@ namespace MarketAlly.IronJava.Core.AST.Builders
return members;
}
private ClassBodyResult BuildInterfaceBody(Java9Parser.InterfaceBodyContext context)
{
var result = new ClassBodyResult();
foreach (var declaration in context.interfaceMemberDeclaration())
{
if (declaration.constantDeclaration() != null)
{
var constant = BuildConstantDeclaration(declaration.constantDeclaration());
if (constant != null) result.Members.Add(constant);
}
else if (declaration.interfaceMethodDeclaration() != null)
{
var method = BuildInterfaceMethodDeclaration(declaration.interfaceMethodDeclaration());
if (method != null) result.Members.Add(method);
}
else if (declaration.classDeclaration() != null)
{
var nestedType = Visit(declaration.classDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
else if (declaration.interfaceDeclaration() != null)
{
var nestedType = Visit(declaration.interfaceDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
}
return result;
}
private FieldDeclaration? BuildConstantDeclaration(Java9Parser.ConstantDeclarationContext context)
{
var location = GetSourceRange(context);
@@ -1172,6 +1248,56 @@ namespace MarketAlly.IronJava.Core.AST.Builders
return members;
}
private ClassBodyResult? BuildEnumBody(Java9Parser.EnumBodyDeclarationsContext? context)
{
if (context == null) return null;
var result = new ClassBodyResult();
foreach (var declaration in context.classBodyDeclaration())
{
if (declaration.classMemberDeclaration() != null)
{
var classMemberContext = declaration.classMemberDeclaration();
// Check if it's a nested type declaration
if (classMemberContext.classDeclaration() != null)
{
var nestedType = Visit(classMemberContext.classDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
else if (classMemberContext.interfaceDeclaration() != null)
{
var nestedType = Visit(classMemberContext.interfaceDeclaration()) as TypeDeclaration;
if (nestedType != null) result.NestedTypes.Add(nestedType);
}
else
{
// It's a regular member (field or method)
var member = BuildClassMember(classMemberContext);
if (member != null) result.Members.Add(member);
}
}
else if (declaration.instanceInitializer() != null)
{
var initializer = BuildInstanceInitializer(declaration.instanceInitializer());
if (initializer != null) result.Members.Add(initializer);
}
else if (declaration.staticInitializer() != null)
{
var initializer = BuildStaticInitializer(declaration.staticInitializer());
if (initializer != null) result.Members.Add(initializer);
}
else if (declaration.constructorDeclaration() != null)
{
var constructor = BuildConstructor(declaration.constructorDeclaration());
if (constructor != null) result.Members.Add(constructor);
}
}
return result;
}
private List<AnnotationMember> BuildAnnotationMembers(Java9Parser.AnnotationTypeBodyContext context)
{
var members = new List<AnnotationMember>();
@@ -3464,5 +3590,12 @@ namespace MarketAlly.IronJava.Core.AST.Builders
return new JavaDoc(range, content, tags);
}
// Helper classes for building class bodies with both members and nested types
private class ClassBodyResult
{
public List<MemberDeclaration> Members { get; set; } = new List<MemberDeclaration>();
public List<TypeDeclaration> NestedTypes { get; set; } = new List<TypeDeclaration>();
}
}
}

2
IronJava.Core/IronJava.Core.csproj
View File

@@ -8,7 +8,7 @@
<!-- NuGet Package Metadata -->
<PackageId>IronJava</PackageId>
<Version>2.1.0</Version>
<Version>2.1.1</Version>
<Authors>David H Friedel Jr</Authors>
<Company>MarketAlly</Company>
<Title>IronJava</Title>

58
TestNestedTypes.cs Normal file
View File

@@ -0,0 +1,58 @@
using System;
using MarketAlly.IronJava.Core;
using MarketAlly.IronJava.Core.AST.Nodes;
class TestNestedTypes
{
static void Main()
{
var javaCode = @"
public class OuterClass {
private int outerField;
public class InnerClass {
private String innerField;
public void innerMethod() {
System.out.println(innerField);
}
}
public static class StaticNestedClass {
private static int staticField;
}
public interface NestedInterface {
void doSomething();
}
}
";
var result = JavaParser.Parse(javaCode);
if (result.Success)
{
Console.WriteLine("Parse successful!");
var outerClass = result.Ast.Types[0] as ClassDeclaration;
if (outerClass != null)
{
Console.WriteLine($"Outer class: {outerClass.Name}");
Console.WriteLine($"Number of members: {outerClass.Members.Count}");
Console.WriteLine($"Number of nested types: {outerClass.NestedTypes.Count}");
foreach (var nestedType in outerClass.NestedTypes)
{
Console.WriteLine($" - Nested type: {nestedType.Name} ({nestedType.GetType().Name})");
}
}
}
else
{
Console.WriteLine("Parse failed!");
foreach (var error in result.Errors)
{
Console.WriteLine($"Error: {error}");
}
}
}
}

77
samples/IronJava.Sample/Program.cs
View File

@@ -15,6 +15,10 @@ namespace MarketAlly.IronJava.Sample
Console.WriteLine("IronJava Sample Application");
Console.WriteLine("===========================\n");
// Test nested types
TestNestedTypes();
Console.WriteLine("\n===========================\n");
// Sample Java code
string javaCode = @"
package com.example;
@@ -219,6 +223,79 @@ class User {
Console.WriteLine($"\nMethods that throw exceptions: {throwingMethods.Count}");
Console.WriteLine();
}
static void TestNestedTypes()
{
Console.WriteLine("Testing Nested Types Feature");
Console.WriteLine("----------------------------");
var javaCode = @"
public class OuterClass {
private int outerField;
public class InnerClass {
private String innerField;
public void innerMethod() {
System.out.println(innerField);
}
}
public static class StaticNestedClass {
private static int staticField;
}
public interface NestedInterface {
void doSomething();
}
public enum NestedEnum {
VALUE1, VALUE2
}
}
";
var result = JavaParser.Parse(javaCode);
if (result.Success)
{
Console.WriteLine("✓ Parse successful!");
var outerClass = result.Ast!.Types[0] as ClassDeclaration;
if (outerClass != null)
{
Console.WriteLine($"\nOuter class: {outerClass.Name}");
Console.WriteLine($" Members: {outerClass.Members.Count}");
Console.WriteLine($" Nested types: {outerClass.NestedTypes.Count}");
foreach (var member in outerClass.Members)
{
if (member is FieldDeclaration field)
{
Console.WriteLine($" - Field: {field.Variables[0].Name}");
}
}
foreach (var nestedType in outerClass.NestedTypes)
{
Console.WriteLine($" - Nested: {nestedType.Name} ({nestedType.GetType().Name})");
if (nestedType is ClassDeclaration nestedClass)
{
Console.WriteLine($" Static: {nestedClass.Modifiers.HasFlag(Modifiers.Static)}");
Console.WriteLine($" Members: {nestedClass.Members.Count}");
}
else if (nestedType is EnumDeclaration nestedEnum)
{
Console.WriteLine($" Constants: {nestedEnum.Constants.Count}");
}
}
}
}
else
{
Console.WriteLine("✗ Parse failed!");
}
}
}
// Custom visitor for code analysis