diff options
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp | 8 | ||||
| -rw-r--r-- | jack/src/com/android/jack/preprocessor/PreProcessor.g | 14 |
5 files changed, 13 insertions, 15 deletions
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java index 877943d..cb66562 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Activity; import com.android.jack.preprocessor.test001.jack.Application; diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java index 2d4479d..8e4ccf2 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Context; diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java index 305abf3..01feaa9 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Context; diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp index 1f4f13b..f30d1d2 100644 --- a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp @@ -1,7 +1,7 @@ test001: @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller class * - modifiers { + is { public | private } extends { @@ -13,20 +13,20 @@ test001: | class com.android.jack.preprocessor.test001.jack.BackupAgent | class com.android.jack.preprocessor.test001.jack.Application } - annotate { + do { @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller method * <init>(); } test002: class * - modifiers { + is { public } extends { class com.android.jack.preprocessor.test001.jack.Application } - annotate { + do { @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller method void attachBaseContext(class com.android.jack.preprocessor.test001.jack.Context) modifiers { diff --git a/jack/src/com/android/jack/preprocessor/PreProcessor.g b/jack/src/com/android/jack/preprocessor/PreProcessor.g index 70aeef4..0239788 100644 --- a/jack/src/com/android/jack/preprocessor/PreProcessor.g +++ b/jack/src/com/android/jack/preprocessor/PreProcessor.g @@ -137,7 +137,7 @@ containsExpression returns [Expression<Boolean, Scope> expression] ; modifiers returns [Expression<Boolean, HasModifier> expression] - : MODIFIERS '{' expr=modifierExpression {expression=$expr.expression;} '}' + : IS '{' expr=modifierExpression {expression=$expr.expression;} '}' ; annotateSets returns [Collection<Expression<Collection<?>, Scope>> sets] @@ -147,7 +147,7 @@ annotateSets returns [Collection<Expression<Collection<?>, Scope>> sets] @after { assert sets != null; } - : ANNOTATE '{' (aSet=set ';' {sets.add($aSet.set);})* '}' + : DO '{' (aSet=set ';' {sets.add($aSet.set);})* '}' ; modifierExpression returns [Expression<Boolean, HasModifier> expression] @@ -342,24 +342,22 @@ booleanOrExpression returns [Expression<Boolean, Scope> expression] matchName : STAR | CONTAINS - | ANNOTATE + | DO | TYPE | FIELD | METHOD - | MODIFIERS - | KIND + | IS | NAME | Identifier ; STAR : '*'; CONTAINS : 'contains' ; -ANNOTATE : 'annotate' ; +DO : 'do' ; TYPE : 'type' ; FIELD : 'field' ; METHOD : 'method' ; -KIND : 'kind' ; -MODIFIERS : 'modifiers' ; +IS : 'is' ; CLASS : 'class' ; PRIVATE : 'private' ; PACKAGE : 'package' ; |