From e29c8bbd16880c21c15e798ef92c00dd66e9d688 Mon Sep 17 00:00:00 2001 From: Benoit Lamarche Date: Thu, 28 Aug 2014 11:08:43 +0200 Subject: Address comments in PreProcessor grammar Change-Id: If237db7d074315c280c1ffa6cfcb89772f0eb41f --- .../test001/jack/app1/ApplicationActivity1.java | 36 ---------------------- .../test001/jack/app1/NoAnnotation.java | 29 ----------------- .../test001/jack/app1/NoAnnotationInterface.java | 25 --------------- .../test001/jack/app1/ApplicationActivity1.java | 36 ++++++++++++++++++++++ .../test001/jack/app1/NoAnnotation.java | 29 +++++++++++++++++ .../test001/jack/app1/NoAnnotationInterface.java | 25 +++++++++++++++ .../jack/preprocessor/test001/jack/config.jpp | 8 ++--- 7 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java (limited to 'jack-tests/tests') diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java deleted file mode 100644 index 877943d..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.test001.jack.app1; - -import com.android.jack.preprocessor.test001.jack.Activity; -import com.android.jack.preprocessor.test001.jack.Application; -import com.android.jack.preprocessor.test001.jack.Context; - -public class ApplicationActivity1 extends Application implements Activity { - - public ApplicationActivity1() { - } - - public void attachBaseContext(Context context) { - - } - - public void noAnnotation(Context context) { - - } - -} diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java deleted file mode 100644 index 2d4479d..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.test001.jack.app1; - -import com.android.jack.preprocessor.test001.jack.Context; - -public class NoAnnotation { - public NoAnnotation() { - } - - public void attachBaseContext(Context context) { - - } - -} diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java deleted file mode 100644 index 305abf3..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.test001.jack.app1; - -import com.android.jack.preprocessor.test001.jack.Context; - -public interface NoAnnotationInterface { - - public void attachBaseContext(Context context); - -} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java new file mode 100644 index 0000000..cb66562 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack.app1; + +import com.android.jack.preprocessor.test001.jack.Activity; +import com.android.jack.preprocessor.test001.jack.Application; +import com.android.jack.preprocessor.test001.jack.Context; + +public class ApplicationActivity1 extends Application implements Activity { + + public ApplicationActivity1() { + } + + public void attachBaseContext(Context context) { + + } + + public void noAnnotation(Context context) { + + } + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java new file mode 100644 index 0000000..8e4ccf2 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack.app1; + +import com.android.jack.preprocessor.test001.jack.Context; + +public class NoAnnotation { + public NoAnnotation() { + } + + public void attachBaseContext(Context context) { + + } + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java new file mode 100644 index 0000000..01feaa9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack.app1; + +import com.android.jack.preprocessor.test001.jack.Context; + +public interface NoAnnotationInterface { + + public void attachBaseContext(Context 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 * (); } 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 { -- cgit v1.1