Merge pull request #39 from prockallsyms/master

Implement the remaining attribute parsing

Author: Palmr

Cargo.toml

@@ -2,7 +2,7 @@
 name = "classfile-parser"
 description = "A parser for Java Class files written in rust"
 version = "0.3.9"
-edition = "2021"
+edition = "2024"
 authors = ["Nick Palmer <nick@palmr.co.uk>"]
 keywords = ["java", "parsing", "class", "classfile"]
 categories = ["parser-implementations"]
@@ -12,6 +12,10 @@ license = "MIT"
 exclude = ["java-assets/out/**/*"]
 
 [dependencies]
-nom = "7"
+nom = "^7"
 bitflags = "^2.3"
 cesu8 = "^1.1"
+binrw = "0.15.0"
+
+[dev-dependencies]
+assert_matches = "1.5.0"

README.md

@@ -24,7 +24,7 @@ use classfile_parser::class_parser;
 
 fn main() {
     let classfile_bytes = include_bytes!("../path/to/JavaClass.class");
-    
+
     match class_parser(classfile_bytes) {
         Ok((_, class_file)) => {
             println!(
@@ -84,30 +84,30 @@ fn main() {
 - [x] Methods
 - [x] Attributes
   - [x] Basic attribute info block parsing
-  - [ ] Known typed attributes parsing
+  - [x] Known typed attributes parsing
     - [x] Critical for JVM
       - [x] ConstantValue
       - [x] Code
       - [x] StackMapTable
       - [x] Exceptions
       - [x] BootstrapMethods
-    - [ ] Critical for Java SE
-      - [ ] InnerClasses
-      - [ ] EnclosingMethod
-      - [ ] Synthetic
-      - [ ] Signature
-      - [ ] RuntimeVisibleAnnotations
-      - [ ] RuntimeInvisibleAnnotations
-      - [ ] RuntimeVisibleParameterAnnotations
-      - [ ] RuntimeInvisibleParameterAnnotations
-      - [ ] RuntimeVisibleTypeAnnotations
-      - [ ] RuntimeInvisibleTypeAnnotations
-      - [ ] AnnotationDefault
+    - [x] Critical for Java SE
+      - [x] InnerClasses
+      - [x] EnclosingMethod
+      - [x] Synthetic
+      - [x] Signature
+      - [x] RuntimeVisibleAnnotations
+      - [x] RuntimeInvisibleAnnotations
+      - [x] RuntimeVisibleParameterAnnotations
+      - [x] RuntimeInvisibleParameterAnnotations
+      - [x] RuntimeVisibleTypeAnnotations
+      - [x] RuntimeInvisibleTypeAnnotations
+      - [x] AnnotationDefault
       - [X] MethodParameters
-    - [ ] Useful but not critical
+    - [x] Useful but not critical
       - [x] SourceFile
-      - [ ] SourceDebugExtension
-      - [ ] LineNumberTable
+      - [~] SourceDebugExtension
+      - [x] LineNumberTable
       - [x] LocalVariableTable
-      - [ ] LocalVariableTypeTable
-      - [ ] Deprecated
+      - [x] LocalVariableTypeTable
+      - [x] Deprecated

java-assets/compile.sh

@@ -25,6 +25,8 @@ javac -d java-assets/compiled-classes/ -g:none java-assets/src/Factorial.java
 javac -d java-assets/compiled-classes/ java-assets/src/Instructions.java
 javac -d java-assets/compiled-classes/ java-assets/src/UnicodeStrings.java
 javac -d java-assets/compiled-classes/ java-assets/src/DeprecatedAnnotation.java
+javac -d java-assets/compiled-classes/ java-assets/src/InnerClasses.java
+javac -d java-assets/compiled-classes/ java-assets/src/Annotations.java
 
 javac -g -d java-assets/compiled-classes/ java-assets/src/LocalVariableTable.java
 javac -d java-assets/compiled-classes/ java-assets/src/HelloWorld.java