From d05c6f0f2bc33c4c3681b4e64232ba1ec7275521 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 16 Mar 2014 20:32:26 -0700 Subject: [PATCH] Implement initial SmaliClassTypeElement --- smalidea/src/main/antlr3/smalideaParser.g | 23 +++++---- .../jf/smalidea/psi/SmaliElementTypes.java | 2 + .../psi/impl/SmaliClassTypeElement.java | 47 +++++++++++++++++++ 3 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java diff --git a/smalidea/src/main/antlr3/smalideaParser.g b/smalidea/src/main/antlr3/smalideaParser.g index 2041f8da..43b138a7 100644 --- a/smalidea/src/main/antlr3/smalideaParser.g +++ b/smalidea/src/main/antlr3/smalideaParser.g @@ -171,17 +171,17 @@ smali_file class_spec @init { Marker marker = mark(); } - : CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR; + : CLASS_DIRECTIVE access_list class_descriptor; finally { marker.done(SmaliElementTypes.CLASS_STATEMENT); } super_spec @init { Marker marker = mark(); } - : SUPER_DIRECTIVE CLASS_DESCRIPTOR; + : SUPER_DIRECTIVE class_descriptor; finally { marker.done(SmaliElementTypes.SUPER_STATEMENT); } implements_spec @init { Marker marker = mark(); } - : IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR; + : IMPLEMENTS_DIRECTIVE class_descriptor; finally { marker.done(SmaliElementTypes.IMPLEMENTS_STATEMENT); } source_spec @@ -335,19 +335,24 @@ primitive_type : PRIMITIVE_TYPE; finally { marker.done(SmaliElementTypes.PRIMITIVE_TYPE); } +class_descriptor + @init { Marker marker = mark(); } + : CLASS_DESCRIPTOR; + finally { marker.done(SmaliElementTypes.CLASS_TYPE); } + type_descriptor : VOID_TYPE | primitive_type - | CLASS_DESCRIPTOR + | class_descriptor | ARRAY_DESCRIPTOR; nonvoid_type_descriptor : primitive_type - | CLASS_DESCRIPTOR + | class_descriptor | ARRAY_DESCRIPTOR; reference_type_descriptor - : CLASS_DESCRIPTOR + : class_descriptor | ARRAY_DESCRIPTOR; null_literal @@ -428,7 +433,7 @@ type_field_method_literal subannotation @init { Marker marker = mark(); } - : SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR annotation_element* END_SUBANNOTATION_DIRECTIVE; + : SUBANNOTATION_DIRECTIVE class_descriptor annotation_element* END_SUBANNOTATION_DIRECTIVE; finally { marker.done(SmaliElementTypes.LITERAL); } literal @@ -480,7 +485,7 @@ annotation_element annotation @init { Marker marker = mark(); } - : ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR + : ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY class_descriptor annotation_element* END_ANNOTATION_DIRECTIVE; finally { marker.done(SmaliElementTypes.ANNOTATION); } @@ -512,7 +517,7 @@ register_range : (REGISTER (DOTDOT REGISTER)?)?; verification_error_reference - : CLASS_DESCRIPTOR | fully_qualified_field | fully_qualified_method; + : class_descriptor | fully_qualified_field | fully_qualified_method; catch_directive : CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE label_ref DOTDOT label_ref CLOSE_BRACE label_ref; 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 959feee1..53aa8610 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java @@ -91,4 +91,6 @@ public class SmaliElementTypes { new SmaliCompositeElementType("SOURCE_DEBUG_STATEMENT", SmaliSourceDebugStatement.FACTORY); public static final SmaliCompositeElementType PRIMITIVE_TYPE = new SmaliCompositeElementType("PRIMITIVE_TYPE", SmaliPrimitiveTypeElement.FACTORY); + public static final SmaliCompositeElementType CLASS_TYPE = + new SmaliCompositeElementType("CLASS_TYPE", SmaliClassTypeElement.FACTORY); } diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.java new file mode 100644 index 00000000..ca937d7e --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClassTypeElement.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 SmaliClassTypeElement extends SmaliCompositeElement { + public static final SmaliCompositeElementFactory FACTORY = new SmaliCompositeElementFactory() { + @Override public SmaliCompositeElement createElement() { + return new SmaliClassTypeElement(); + } + }; + + public SmaliClassTypeElement() { + super(SmaliElementTypes.CLASS_TYPE); + } +}