diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-30 17:03:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-30 17:03:27 +0000 |
| commit | 09bf66b2e7d4025981246494cd83b95ccca7e152 (patch) | |
| tree | 2d3305e79f6677125f5d12a8c7250a65e99facf2 | |
| parent | 8927f3502732c19a1d26b46b4cb24468c751e4e6 (diff) | |
| parent | 91a4a2045f29c6186ff71bd48f28e5ad7c989259 (diff) | |
| download | doclava-09bf66b2e7d4025981246494cd83b95ccca7e152.tar.gz | |
Merge "Add NULL as a primitive type" am: 91a4a2045f
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2515096
Change-Id: I2f77209319b0bde4a89fc4e1003f3c97ad6ee096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java | 3 | ||||
| -rw-r--r-- | doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java index 9bab2f7..adc6755 100644 --- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java +++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/PrimitiveTypeImpl.java @@ -45,7 +45,8 @@ public enum PrimitiveTypeImpl implements Type { INT("int"), LONG("long"), SHORT("short"), - VOID("void"); + VOID("void"), + NULL("null"); private final String name; diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java index 96b2c2e..44a37a6 100644 --- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java +++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java @@ -66,6 +66,7 @@ abstract class TypeImpl implements Type { case SHORT -> PrimitiveTypeImpl.SHORT; // void is also a "primitive type" case VOID -> PrimitiveTypeImpl.VOID; + case NULL -> PrimitiveTypeImpl.NULL; // arrays case ARRAY -> { yield ArrayTypeImpl.create((ArrayType) m, context); |