summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-03-30 17:16:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-30 17:16:29 +0000
commit5d30bf99ca898a7c9dec7bf0916697aa8948842a (patch)
tree2d3305e79f6677125f5d12a8c7250a65e99facf2
parent9934320746d13d22560db30f646d63d0074bb2ed (diff)
parent09bf66b2e7d4025981246494cd83b95ccca7e152 (diff)
downloaddoclava-5d30bf99ca898a7c9dec7bf0916697aa8948842a.tar.gz
Merge "Add NULL as a primitive type" am: 91a4a2045f am: 09bf66b2e7
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2515096 Change-Id: I9ac8066d353fb991616e06b1618edfd548679e8a 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.java3
-rw-r--r--doclet_adapter/src/main/java/com/google/doclava/javadoc/TypeImpl.java1
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);