Repository navigation
Add support for static inner classes - #107
Conversation
…ntain permissions' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
This reverts commit 8e933b6.
- Updated grammar.pegjs and grammar.ts to add EnumDeclaration parsing - Added TopLevelClassOrInterfaceDeclaration and ClassMemberDeclaration alternatives for EnumDeclaration - Added EnumDeclaration, EnumBody, EnumConstantList, and EnumConstant parsing rules - Created src/compiler/__tests__/tests/enum.test.ts with 3 enum test cases - Updated src/compiler/__tests__/index.ts to import and run enum tests Remaining work: - Run enum compiler tests to verify parsing works - Implement enum code generation in compiler.ts (enum initialization, synthetic methods) - Run full test suite to validate no regressions - Verify enum runtime behavior (ordinal(), name(), values(), valueOf()) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Updated grammar (grammar.pegjs and grammar.ts) to parse enum declarations - EnumDeclaration, EnumBody, EnumConstantList, EnumConstant rules - Support for optional semicolon after constants and enum body members - Extended AST types (src/ast/types/classes.ts) - Added EnumDeclaration, EnumBody, EnumConstant interfaces - Updated ClassDeclaration union to include EnumDeclaration - Updated ClassBodyDeclaration to include EnumDeclaration - Added EnumDeclaration to NodeMap (src/ast/types/ast.ts) - Updated compiler to handle enum declarations - Added compileEnum() method in src/compiler/compiler.ts - Updated compile() to route EnumDeclaration through compileEnum() - Fixed type signatures to handle both ClassDeclaration and EnumDeclaration - Set enum parent to java/lang/Enum and ACC_ENUM flag - Updated ast-extractor.ts and ec-evaluator/utils.ts to accept ClassDeclaration[] - Updated searchMainMtdClass() to filter out enums - Created src/compiler/__tests__/tests/enum.test.ts with 3 test cases - enum switch and synthetic methods - enum values returns cloned array - enum constructors and instance fields Status: Enums parse and compile, but synthetic methods not yet implemented. Tests failing because ordinal(), name(), values(), valueOf() missing. Next: Implement synthetic enum method generation in compiler.ts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Added enumOrdinals Map to track enum constant ordinals - Registered ordinal(), name(), toString(), values(), valueOf() in symbol table - Fixed FieldInfo insertion to remove invalid 'ordinal' property - Fixed generateSimpleEnumMethod to use indexFieldrefInfo() Status: Compiler builds but enum compiler tests fail with: 1. Switch statement codegen doesn't recognize enum types 2. Bytecode generation may have structural issues Next: Fix enum type detection in switch codegen, then debug bytecode generation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* jvm changes * include try/catch/finally support in code generator * fix try statement logic * add parser and type checker integration * fix finally bug * add tests and fix syntax error * Patch grammar logic for throws keyword * Revert "Patch grammar logic for throws keyword" This reverts commit 8e933b6. * Patch grammar logic for throws keyword * Add fix for execption table finally logic * Add more tests * fix finally bug and missing test imports --------- Co-authored-by: Martin Henz <henz@comp.nus.edu.sg>
# Conflicts: # src/ast/types/classes.ts # src/compiler/__tests__/classOrdering.test.ts # src/compiler/__tests__/index.ts # src/compiler/compiler.ts
Coverage report
Show new covered files 🐣
Show files with reduced coverage 🔻
Test suite run success1271 tests passing in 76 suites. Report generated by 🧪jest coverage report action from ecb8a2f |
rmz-oz
left a comment
rmz-oz
left a comment
There was a problem hiding this comment.
The new compilationOrder drops the enums-first ordering from #99, so a top-level enum declared after the class that uses it stops compiling. class Main { ... Day d = Day.MONDAY; ... } enum Day { SUNDAY, MONDAY } works on main but on this branch fails with Unsupported class type conversion: Ljava/lang/Class; -> LDay;. Putting all enums first, then member classes, then top-level classes fixed it for me and the full jest suite still passed (with a JDK on PATH).
Also, two outer classes that each have a static class Node throw SymbolRedeclarationError: "B$Node" has already been declared, since the simple name Node is registered at the root for both.
Thanks for the feedback! I have updated such that it now uses a two-pass system to check references, so as long as they are in the same scope the code will compile. The duplicate naming throwing an error is known and we are planning to fix it in the future when multiclass/multifile support is implemented |
|
the enum case passes on c5e47ea now. one more I ran into: |
# Conflicts: # package.json # src/conductor/JavaEvaluator.ts # src/conductor/__tests__/JavaEvaluator.test.ts # yarn.lock
# Conflicts: # src/compiler/import/lib-closure.ts # src/conductor/JavaEvaluator.ts # src/conductor/__tests__/JavaEvaluator.test.ts # src/jvm/utils/build.ts # src/jvm/utils/stdlib-classfiles.ts # src/types/checker/prechecks.ts
|
@codex review |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 9d126a8ad3
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
# Conflicts: # src/conductor/JavaEvaluator.ts
This PR adds support for static inner classes within java-slang.
Note: support for non-static inner classes is not supported yet due to a framework being needed to resolve name collisions. This can be potentially developed in the future.