From 4e834f8323640768ca37f7f4598942a0ad1a04cc Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sun, 16 Mar 2014 20:48:08 -0700
Subject: [PATCH] Implement initial SmaliVoidElementType

---
 smalidea/src/main/antlr3/smalideaParser.g     | 11 +++--
 .../jf/smalidea/psi/SmaliElementTypes.java    |  2 +
 .../psi/impl/SmaliVoidTypeElement.java        | 47 +++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliVoidTypeElement.java

diff --git a/smalidea/src/main/antlr3/smalideaParser.g b/smalidea/src/main/antlr3/smalideaParser.g
index 80bfe527..2e8c0ad7 100644
--- a/smalidea/src/main/antlr3/smalideaParser.g
+++ b/smalidea/src/main/antlr3/smalideaParser.g
@@ -345,8 +345,13 @@ array_descriptor
   : ARRAY_DESCRIPTOR;
   finally { marker.done(SmaliElementTypes.ARRAY_TYPE); }
 
+void_type
+  @init { Marker marker = mark(); }
+  : VOID_TYPE;
+  finally { marker.done(SmaliElementTypes.VOID_TYPE); }
+
 type_descriptor
-  : VOID_TYPE
+  : void_type
   | primitive_type
   | class_descriptor
   | array_descriptor;
@@ -433,7 +438,7 @@ type_field_method_literal
     | /* epsilon */
     )
   | primitive_type
-  | VOID_TYPE;
+  | void_type;
   finally { marker.done(SmaliElementTypes.LITERAL); }
 
 subannotation
@@ -557,7 +562,7 @@ line_directive
 
 local_directive
   @init { Marker marker = mark(); }
-  : LOCAL_DIRECTIVE REGISTER (COMMA (null_literal | string_literal) COLON (VOID_TYPE | nonvoid_type_descriptor)
+  : LOCAL_DIRECTIVE REGISTER (COMMA (null_literal | string_literal) COLON (void_type | nonvoid_type_descriptor)
                               (COMMA string_literal)? )?;
   finally { marker.done(SmaliElementTypes.LOCAL_DEBUG_STATEMENT); }
 
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
index fbde9b0b..de07a4b3 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
@@ -95,4 +95,6 @@ public class SmaliElementTypes {
             new SmaliCompositeElementType("CLASS_TYPE", SmaliClassTypeElement.FACTORY);
     public static final SmaliCompositeElementType ARRAY_TYPE =
             new SmaliCompositeElementType("ARRAY_TYPE", SmaliArrayTypeElement.FACTORY);
+    public static final SmaliCompositeElementType VOID_TYPE =
+            new SmaliCompositeElementType("VOID_TYPE", SmaliVoidTypeElement.FACTORY);
 }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliVoidTypeElement.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliVoidTypeElement.java
new file mode 100644
index 00000000..92a91d12
--- /dev/null
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliVoidTypeElement.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.smalidea.psi.impl;
+
+import org.jf.smalidea.psi.SmaliCompositeElementFactory;
+import org.jf.smalidea.psi.SmaliElementTypes;
+
+public class SmaliVoidTypeElement extends SmaliCompositeElement {
+    public static final SmaliCompositeElementFactory FACTORY = new SmaliCompositeElementFactory() {
+        @Override public SmaliCompositeElement createElement() {
+            return new SmaliVoidTypeElement();
+        }
+    };
+
+    public SmaliVoidTypeElement() {
+        super(SmaliElementTypes.VOID_TYPE);
+    }
+}