mirrors
/
org.aspectj
mirror of https://github.com/eclipse/org.aspectj.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 138 Wiki Activity
Browse Source

AspectJ 1.8

tags/V1_8_0RC1
Andy Clement 10 years ago
parent
302c14ee68
commit
38206a5304
37 changed files with 399 additions and 78 deletions
Split View Show Diff Stats
  1. 0
    1
      ajdoc/.classpath
  2. 110
    0
      docs/dist/doc/README-180.html
  3. 1
    0
      docs/dist/doc/index.html
  4. BIN
      lib/asm/asm-5.0_ALPHA.jar
  5. BIN
      lib/asm/asm-5.0_ALPHA.renamed.jar
  6. 3
    3
      lib/asm/build.xml
  7. 2
    2
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
  8. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
  9. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
  10. 6
    4
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
  11. 4
    2
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java
  12. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
  13. 9
    2
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
  14. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
  15. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
  16. 10
    10
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
  17. 29
    20
      org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
  18. 4
    0
      org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
  19. BIN
      org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
  20. BIN
      org.eclipse.jdt.core/jdtcore-for-aspectj.jar
  21. 13
    4
      taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
  22. 12
    10
      testing/newsrc/org/aspectj/testing/AjcTest.java
  23. 45
    0
      tests/bugs180/firstprogram/C.java
  24. 2
    2
      tests/features152/synchronization/transformed/expected/Investigation.c.txt
  25. 2
    2
      tests/features152/synchronization/transformed/expected/One.c.txt
  26. 30
    0
      tests/src/org/aspectj/systemtest/AllTests18.java
  27. 4
    3
      tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
  28. 2
    0
      tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
  29. 4
    2
      tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
  30. 1
    1
      tests/src/org/aspectj/systemtest/ajc170/ajc170.xml
  31. 39
    0
      tests/src/org/aspectj/systemtest/ajc180/Ajc180Tests.java
  32. 25
    0
      tests/src/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java
  33. 25
    0
      tests/src/org/aspectj/systemtest/ajc180/ajc180.xml
  34. 4
    1
      tests/testsrc/org/aspectj/tests/TestsModuleTests.java
  35. 5
    1
      util/src/org/aspectj/util/LangUtil.java
  36. 1
    1
      weaver/.classpath
  37. 2
    2
      weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java

+ 0
- 1
ajdoc/.classpath View File

@@ -7,7 +7,6 @@
<classpathentry kind="src" path="/util"/>
<classpathentry kind="src" path="testsrc"/>
<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/>
<classpathentry kind="var" path="JRE15_LIB"/>
<classpathentry kind="output" path="bin"/>
</classpath>

+ 110
- 0
docs/dist/doc/README-180.html View File

@@ -0,0 +1,110 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html> <head>
<title>AspectJ 1.8.0 Readme</title>
<style type="text/css">
<!--
P { margin-left: 20px; }
PRE { margin-left: 20px; }
LI { margin-left: 20px; }
H4 { margin-left: 20px; }
H3 { margin-left: 10px; }
-->
</style>
</head>

<body>
<div align="right"><small>
&copy; Copyright 2013 Contributors.
All rights reserved.
</small></div>

<h1>AspectJ 1.8.0 Readme</h1>

<p>The full list of resolved issues in 1.8.0 is available
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;product=AspectJ;target_milestone=1.8.0;">here</a></h2>.</p>

<ul>
<li>1.8.0.M1 available 29-Jul-2013
</ul>

<h2>Overview</h2>

<p>In previous AspectJ major releases the first milestone normally tolerates weaving bytecode for the
comparable Java level whilst the ability to compile source code for that Java level comes later.
However, AspectJ 1.8.0.M1 is a Java 8 compiler. So why change the approach this time? Some
consumers of AspectJ are choosing to exploit Java8 library features even though they are not
using Java8 language constructs in their source. The Eclipse JDT compiler (in eclipse 4.3) actually
includes a number of changes to facilitate this (basically compiling with -source 1.7 but on top
of a 1.8 JRE). The changes are necessary because the 1.8 classes include metadata that the 1.7
compiler just isn't expecting. For example default method implementations in interfaces. In order
to support this mode of working AspectJ would need to update to the Eclipse 4.3 compiler. However,
performing upgrades of the compiler inside AspectJ is non trivial and to avoid doing the
upgrade to 4.3 and then doing a further upgrade to the Java8 compiler, we decided to jump straight
to the Java8 compiler which already includes these changes.
</p>

<h2>Notable changes</h2>

<h3>Java 8 compilation</h3>

<p>AspectJ has been updated to the latest available BETA_JAVA8 support level in the Eclipse Java
compiler. The BETA_JAVA8 tag chosen was commit #3D6E745.</p>
<p><b>NOTE:</b>The Java8 libraries are still in flux and changing regularly. If you are going to
use AspectJ 1.8.0.M1 you must run with a compatible level of Java8. We have been testing with
beta 97. Code compiled with this compiler is not guaranteed to run on a later JDK level.
</p>
<p>AspectJ 1.8.0.M1 will now compile Java 8 code, here is a sample:</p>

<pre><code>
=== 8< ==== C.java ==== 8< ===
import java.util.Arrays;

interface I {
// Default method
default void foo() {
System.out.println("ABC");
}
}

public class C implements I{
public static void main(String[] args) {
new C().foo();
// Lambda
Runnable r = () -> { System.out.println("hello world!"); };
r.run();
// Used Java8 b97
Arrays.asList(MyClass.doSomething()).forEach((p) -> System.out.println(p));
}
}

aspect X {
before(): execution(* I.foo()) {
System.out.println("I.foo running");
}
before(): staticinitialization(!X) {
System.out.println("Clazz "+thisJoinPointStaticPart);
}
}


class Utils {
public static int compareByLength(String in, String out) {
return in.length() - out.length();
}
}

class MyClass {
public static String[] doSomething() {
String []args = new String[]{"4444","333","22","1"};
// Method reference
Arrays.sort(args,Utils::compareByLength);
return args;
}
}
=== 8< ==== C.java ==== 8< ===
</code></pre>

<h4>
<!-- ============================== -->
</body>
</html>

+ 1
- 0
docs/dist/doc/index.html View File

@@ -138,6 +138,7 @@
<tr> <td>README's
</td>
<td>Changes and porting guide for AspectJ
<a href="README-180.html">1.8.0.M1</a>,
<a href="README-173.html">1.7.3</a>,
<a href="README-172.html">1.7.2</a>,
<a href="README-171.html">1.7.1</a>,

BIN
lib/asm/asm-5.0_ALPHA.jar View File


BIN
lib/asm/asm-5.0_ALPHA.renamed.jar View File


+ 3
- 3
lib/asm/build.xml View File

@@ -3,9 +3,9 @@
<!-- if you need this defining, use the jarjar-1.0.jar in this project -->
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>

<target name="package" description="Jarjar asm-4.0.jar and prefix package name with aj">
<jarjar destfile="asm-4.0.renamed.jar">
<zipfileset src="asm-4.0.jar"/>
<target name="package" description="Jarjar asm-5.0_ALPHA.jar and prefix package name with aj">
<jarjar destfile="asm-5.0_ALPHA.renamed.jar">
<zipfileset src="asm-5.0_ALPHA.jar"/>
<rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
</jarjar>
</target>

+ 2
- 2
org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties View File

@@ -4,8 +4,8 @@
The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy.
### AspectJ-specific messages
compiler.name = AspectJ Compiler 1.7.3
compiler.version = Eclipse Compiler 0.B79_R37x, 3.7
compiler.name = AspectJ Compiler 1.8.0
compiler.version = Eclipse Compiler BETA_JAVA8_3D6E745, 3.9
compiler.copyright =

## this next one superceded by above...

+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java View File

@@ -129,7 +129,7 @@ public class WeaverMessageHandler implements IMessageHandler {
if (details.length() != 0) {
problem.setSupplementaryMessageInfo(details.toString());
}
compiler.problemReporter.record(problem, problemSource, referenceContext);
compiler.problemReporter.record(problem, problemSource, referenceContext, message.isError());
return true;
}


+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java View File

@@ -74,7 +74,7 @@ public class AdviceDeclaration extends AjMethodDeclaration {

public AdviceDeclaration(CompilationResult result, AdviceKind kind) {
super(result);
this.returnType = TypeReference.baseTypeReference(T_void, 0);
this.returnType = TypeReference.baseTypeReference(T_void, 0,null);
this.kind = kind;
}


+ 6
- 4
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java View File

@@ -575,8 +575,8 @@ public class AspectDeclaration extends TypeDeclaration {

BranchLabel instanceFound = new BranchLabel(codeStream);

ExceptionLabel anythingGoesWrong = new ExceptionLabel(codeStream, world
.makeTypeBinding(UnresolvedType.JL_EXCEPTION));
TypeBinding exceptionTypeBinding = world.makeTypeBinding(UnresolvedType.JL_EXCEPTION);
ExceptionLabel anythingGoesWrong = new ExceptionLabel(codeStream, exceptionTypeBinding);
anythingGoesWrong.placeStart();
codeStream.aload_0();
codeStream.invoke(Opcodes.OPC_invokestatic,
@@ -604,7 +604,7 @@ public class AspectDeclaration extends TypeDeclaration {
codeStream.areturn();
anythingGoesWrong.placeEnd();
anythingGoesWrong.place();
codeStream.pushExceptionOnStack(exceptionTypeBinding); // For stackmap computation to behave
codeStream.astore_1();
codeStream.new_(world.makeTypeBinding(AjcMemberMaker.NO_ASPECT_BOUND_EXCEPTION));

@@ -790,7 +790,8 @@ public class AspectDeclaration extends TypeDeclaration {
.makeTypeBinding(UnresolvedType.JL_CLASS), Modifier.PUBLIC, true);
codeStream.record(theTypeVar);
theTypeVar.recordInitializationStartPC(0);
ExceptionLabel exc = new ExceptionLabel(codeStream, world.makeTypeBinding(UnresolvedType.JL_EXCEPTION));
TypeBinding exceptionTypeBinding = world.makeTypeBinding(UnresolvedType.JL_EXCEPTION);
ExceptionLabel exc = new ExceptionLabel(codeStream, exceptionTypeBinding);
exc.placeStart();
codeStream.aload_0();
codeStream.ldc(NameMangler.perTypeWithinLocalAspectOf(typeX));
@@ -830,6 +831,7 @@ public class AspectDeclaration extends TypeDeclaration {
exc.placeEnd();
codeStream.areturn();
exc.place();
codeStream.pushExceptionOnStack(exceptionTypeBinding); // For stackmap computation to behave
codeStream.astore_1();
// this just returns null now - the old version used to throw the caught exception!
codeStream.aconst_null();

+ 4
- 2
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java View File

@@ -17,6 +17,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Annotation;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MarkerAnnotation;
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.FlowContext;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.FlowInfo;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.InitializationFlowContext;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope;
@@ -41,8 +42,9 @@ public class DeclareAnnotationDeclaration extends DeclareDeclaration {
symbolicDeclare.setAnnotationLocation(annotation.sourceStart, annotation.sourceEnd);
}

public void analyseCode(ClassScope classScope, InitializationFlowContext initializationContext, FlowInfo flowInfo) {
super.analyseCode(classScope, initializationContext, flowInfo);
@Override
public void analyseCode(ClassScope classScope, FlowContext flowContext, FlowInfo flowInfo) {
super.analyseCode(classScope, flowContext, flowInfo);

if (isRemover) {
if (((DeclareAnnotation) declareDecl).getKind() != DeclareAnnotation.AT_FIELD) {

+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java View File

@@ -55,7 +55,7 @@ public class DeclareDeclaration extends AjMethodDeclaration {
declarationSourceEnd = sourceEnd = declareDecl.getEnd();
}
// ??? we might need to set parameters to be empty
this.returnType = TypeReference.baseTypeReference(T_void, 0);
this.returnType = TypeReference.baseTypeReference(T_void, 0, null);
}

public void addAtAspectJAnnotations() {

+ 9
- 2
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java View File

@@ -27,6 +27,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeReference;
import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream;
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.Opcodes;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.FlowContext;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.FlowInfo;
import org.aspectj.org.eclipse.jdt.internal.compiler.flow.InitializationFlowContext;
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope;
@@ -77,11 +78,17 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration {
return (declaredModifiers & ClassFileConstants.AccFinal) != 0;
}

public void analyseCode(ClassScope currentScope, InitializationFlowContext flowContext, FlowInfo flowInfo) {
// public boolean isAbstract() {
// boolean b = (declaredModifiers & ClassFileConstants.AccAbstract) != 0;
// return b;//super.isAbstract();
// }

@Override
public void analyseCode(ClassScope classScope, FlowContext flowContext, FlowInfo flowInfo) {
if (Modifier.isAbstract(declaredModifiers))
return;

super.analyseCode(currentScope, flowContext, flowInfo);
super.analyseCode(classScope, flowContext, flowInfo);
}

public void resolve(ClassScope upperScope) {

+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java View File

@@ -60,7 +60,7 @@ public class PointcutDeclaration extends AjMethodDeclaration {

public PointcutDeclaration(CompilationResult compilationResult) {
super(compilationResult);
this.returnType = TypeReference.baseTypeReference(T_void, 0);
this.returnType = TypeReference.baseTypeReference(T_void, 0, null);
}

private Pointcut getPointcut() {

+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java View File

@@ -749,7 +749,7 @@ public class AjProblemReporter extends ProblemReporter {
// confuse the user
public void parseErrorInsertAfterToken(int start, int end, int currentKind, char[] errorTokenSource, String errorTokenName,
String expectedToken) {
if (expectedToken.equals("privileged")) {
if (expectedToken.equals("privileged") || expectedToken.equals("around")) {
super.parseErrorNoSuggestion(start, end, currentKind, errorTokenSource, errorTokenName);
} else {
super.parseErrorInsertAfterToken(start, end, currentKind, errorTokenSource, errorTokenName, expectedToken);

+ 10
- 10
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java View File

@@ -52,15 +52,15 @@ public class AjCompilerOptions extends CompilerOptions {


// constants for irritant levels
public static final int InvalidAbsoluteTypeName = IrritantSet.GROUP2 | ASTNode.Bit8;
public static final int InvalidWildCardTypeName = IrritantSet.GROUP2 | ASTNode.Bit9;
public static final int UnresolvableMember = IrritantSet.GROUP2 | ASTNode.Bit10;
public static final int TypeNotExposedToWeaver = IrritantSet.GROUP2 | ASTNode.Bit11;
public static final int ShadowNotInStructure = IrritantSet.GROUP2 | ASTNode.Bit12;
public static final int UnmatchedSuperTypeInCall = IrritantSet.GROUP2 | ASTNode.Bit13;
public static final int CannotImplementLazyTJP = IrritantSet.GROUP2 | ASTNode.Bit14;
public static final int NeedSerialVersionUIDField = IrritantSet.GROUP2 | ASTNode.Bit15;
public static final int IncompatibleSerialVersion = IrritantSet.GROUP2 | ASTNode.Bit16;
public static final int InvalidAbsoluteTypeName = IrritantSet.GROUP2 | ASTNode.Bit20;
public static final int InvalidWildCardTypeName = IrritantSet.GROUP2 | ASTNode.Bit21;
public static final int UnresolvableMember = IrritantSet.GROUP2 | ASTNode.Bit22;
public static final int TypeNotExposedToWeaver = IrritantSet.GROUP2 | ASTNode.Bit23;
public static final int ShadowNotInStructure = IrritantSet.GROUP2 | ASTNode.Bit24;
public static final int UnmatchedSuperTypeInCall = IrritantSet.GROUP2 | ASTNode.Bit25;
public static final int CannotImplementLazyTJP = IrritantSet.GROUP2 | ASTNode.Bit26;
public static final int NeedSerialVersionUIDField = IrritantSet.GROUP2 | ASTNode.Bit27;
public static final int IncompatibleSerialVersion = IrritantSet.GROUP2 | ASTNode.Bit28;

public boolean terminateAfterCompilation = false;
public boolean xSerializableAspects = false;
@@ -129,7 +129,7 @@ public class AjCompilerOptions extends CompilerOptions {
* @see org.eclipse.jdt.internal.compiler.impl.CompilerOptions#getMap()
*/
public Map getMap() {
Map map = super.getMap();
Map<String,String> map = super.getMap();
// now add AspectJ additional options
map.put(OPTION_ReportInvalidAbsoluteTypeName, getSeverityString(InvalidAbsoluteTypeName));
map.put(OPTION_ReportInvalidWildcardTypeName, getSeverityString(InvalidWildCardTypeName));

+ 29
- 20
org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java View File

@@ -2189,7 +2189,7 @@ public class AjASTConverter extends ASTConverter {
if (this.resolveBindings) {
recordNodes(classInstanceCreation, allocation);
}
removeTrailingCommentFromExpressionEndingWithAParen(classInstanceCreation);
// removeTrailingCommentFromExpressionEndingWithAParen(classInstanceCreation);
return classInstanceCreation;
}
}
@@ -2868,7 +2868,7 @@ public class AjASTConverter extends ASTConverter {
length = typeReference.sourceEnd - typeReference.sourceStart + 1;
// need to find out if this is an array type of primitive types or not
if (isPrimitiveType(name)) {
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length);
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length)[1];
if (end == -1) {
end = sourceStart + length - 1;
}
@@ -2880,7 +2880,7 @@ public class AjASTConverter extends ASTConverter {
ParameterizedSingleTypeReference parameterizedSingleTypeReference = (ParameterizedSingleTypeReference) typeReference;
final SimpleName simpleName = new SimpleName(this.ast);
simpleName.internalSetIdentifier(new String(name));
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length);
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length)[1];
if (end == -1) {
end = sourceStart + length - 1;
}
@@ -2926,7 +2926,7 @@ public class AjASTConverter extends ASTConverter {
simpleName.internalSetIdentifier(new String(name));
// we need to search for the starting position of the first brace in order to set the proper length
// PR http://dev.eclipse.org/bugs/show_bug.cgi?id=10759
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length);
int end = retrieveEndOfElementTypeNamePosition(sourceStart, sourceStart + length)[1];
if (end == -1) {
end = sourceStart + length - 1;
}
@@ -3620,32 +3620,41 @@ public class AjASTConverter extends ASTConverter {
}

/**
* This method is used to retrieve the position just before the left bracket.
* This method is used to retrieve the start and end position of a name or primitive type token.
*
* @return int the dimension found, -1 if none
* @return int[] a single dimensional array, with two elements, for the start and end positions of the name respectively
*/
protected int retrieveEndOfElementTypeNamePosition(int start, int end) {
protected int[] retrieveEndOfElementTypeNamePosition(int start, int end) {
this.scanner.resetTo(start, end);
boolean isAnnotation = false;
try {
int token;
while ((token = this.scanner.getNextToken()) != TerminalTokens.TokenNameEOF) {
switch (token) {
case TerminalTokens.TokenNameIdentifier:
case TerminalTokens.TokenNamebyte:
case TerminalTokens.TokenNamechar:
case TerminalTokens.TokenNamedouble:
case TerminalTokens.TokenNamefloat:
case TerminalTokens.TokenNameint:
case TerminalTokens.TokenNamelong:
case TerminalTokens.TokenNameshort:
case TerminalTokens.TokenNameboolean:
return this.scanner.currentPosition - 1;
switch(token) {
case TerminalTokens.TokenNameAT:
isAnnotation = true;
break;
case TerminalTokens.TokenNameIdentifier:
if (isAnnotation) {
isAnnotation = false;
break;
}
//$FALL-THROUGH$
case TerminalTokens.TokenNamebyte:
case TerminalTokens.TokenNamechar:
case TerminalTokens.TokenNamedouble:
case TerminalTokens.TokenNamefloat:
case TerminalTokens.TokenNameint:
case TerminalTokens.TokenNamelong:
case TerminalTokens.TokenNameshort:
case TerminalTokens.TokenNameboolean:
return new int[]{this.scanner.startPosition, this.scanner.currentPosition - 1};
}
}
} catch (InvalidInputException e) {
} catch(InvalidInputException e) {
// ignore
}
return -1;
return new int[]{-1, -1};
}

/**

+ 4
- 0
org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java View File

@@ -55,6 +55,10 @@ public class AsmBuilderTest extends TestCase {
public char[] getFileName() {
return null;
}

public boolean ignoreOptionalProblems() {
return false;
}
};
TypeDeclaration local = new TypeDeclaration(new CompilationResult(cu, 0, 0, 0));

BIN
org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip View File


BIN
org.eclipse.jdt.core/jdtcore-for-aspectj.jar View File


+ 13
- 4
taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java View File

@@ -524,7 +524,9 @@ public class AjcTaskTest extends TestCase {
Holder.class.getName());
String result = MESSAGES.toString();
MESSAGES.setLength(0);
assertEquals("messages", "e", result);
// The test program produces three errors with the current 1.8 compiler, this may change by 1.8 release and so
// this will need reverting back to "e"
assertEquals("messages", "eee", result);
}

// TODO skipped test - works locally but not on build machine?
@@ -590,7 +592,8 @@ public class AjcTaskTest extends TestCase {
final PrintStream serr = System.err;
try {
System.setErr(new PrintStream(new java.io.ByteArrayOutputStream()));
runTest(task, BuildException.class, MessageHolderChecker.ONE_ERROR);
// Current 1.8 compiler produces 3 errors for this test program, may need reverting to ONE_ERROR by release
runTest(task, BuildException.class, MessageHolderChecker.THREE_ERRORS);
} finally {
System.setErr(serr);
}
@@ -618,7 +621,10 @@ public class AjcTaskTest extends TestCase {
public void testCompileErrorList() {
AjcTask task = getTask("compileError.lst");
task.setFailonerror(false);
runTest(task, NO_EXCEPTION, MessageHolderChecker.ONE_ERROR);
// Prior to the 1.8 compiler there is one error here, 'syntax error on here'
// With 1.8 there are 3 errors about completing the method header, ending the class body, ending the method - this may
// change by 1.8 final... this might need reverting back to ONE_ERROR
runTest(task, NO_EXCEPTION, MessageHolderChecker.THREE_ERRORS);
}
public void testShowWeaveInfo() {
@@ -703,7 +709,8 @@ public class AjcTaskTest extends TestCase {
public void testCompileErrorFile() {
AjcTask task = getTask("compileError.lst");
task.setFailonerror(false);
runTest(task, NO_EXCEPTION, MessageHolderChecker.ONE_ERROR);
// 1.8 compiler currently produces 3 errors for the test program, may need to revert to ONE_ERROR by 1.8 release
runTest(task, NO_EXCEPTION, MessageHolderChecker.THREE_ERRORS);
}

public void testCompileWarningFile() {
@@ -906,6 +913,8 @@ public class AjcTaskTest extends TestCase {
/** one warning, any number of info messages */
static MessageHolderChecker ONE_WARNING =
new MessageHolderChecker(0, 0, 0, 1, IGNORE);
static MessageHolderChecker THREE_ERRORS =
new MessageHolderChecker(0, 0, 3, 0, IGNORE);

int aborts, fails, errors, warnings, infos;

+ 12
- 10
testing/newsrc/org/aspectj/testing/AjcTest.java View File

@@ -1,13 +1,10 @@
/* *******************************************************************
* Copyright (c) 2004 IBM Corporation
* Copyright (c) 2004,2013 IBM Corporation, contributors
* All rights reserved.
* This program and the accompanying materials are made available
* under the terms of the Eclipse Public License v1.0
* which accompanies this distribution and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Adrian Colyer,
* ******************************************************************/
package org.aspectj.testing;

@@ -17,18 +14,17 @@ import java.util.List;
import org.aspectj.tools.ajc.AjcTestCase;

/**
* @author colyer
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
* @author Adrian Colyer
* @author Andy Clement
*/
public class AjcTest {
private static boolean is13VMOrGreater = true;
// private static boolean is13VMOrGreater = true;
private static boolean is14VMOrGreater = true;
private static boolean is15VMOrGreater = false;
private static boolean is16VMOrGreater = false;
private static boolean is17VMOrGreater = false;
private static boolean is18VMOrGreater = false;
static { // matching logic is also in org.aspectj.util.LangUtil
String vm = System.getProperty("java.version"); // JLS 20.18.7
@@ -44,7 +40,12 @@ public class AjcTest {
} else if (vm.startsWith("1.7")) {
is15VMOrGreater = true;
is16VMOrGreater = true;
is17VMOrGreater=true;
is17VMOrGreater = true;
} else if (vm.startsWith("1.8")) {
is15VMOrGreater = true;
is16VMOrGreater = true;
is17VMOrGreater = true;
is18VMOrGreater = true;
}
}

@@ -87,6 +88,7 @@ public class AjcTest {
if (vmLevel.equals("1.5")) canRun = is15VMOrGreater;
if (vmLevel.equals("1.6")) canRun = is16VMOrGreater;
if (vmLevel.equals("1.7")) canRun = is17VMOrGreater;
if (vmLevel.equals("1.8")) canRun = is18VMOrGreater;
if (!canRun) {
System.out.println("***SKIPPING TEST***" + getTitle()+ " needs " + getVmLevel()
+ ", currently running on " + System.getProperty("java.vm.version"));

+ 45
- 0
tests/bugs180/firstprogram/C.java View File

@@ -0,0 +1,45 @@
import java.util.Arrays;


interface I {
// Default method
default void foo() {
System.out.println("ABC");
}
}

public class C implements I{
public static void main(String[] args) {
new C().foo();
// Lambda
Runnable r = () -> { System.out.println("hello world!"); };
r.run();
// Used Java8 b97
Arrays.asList(MyClass.doSomething()).forEach((p) -> System.out.println(p));
}
}

aspect X {
before(): execution(* I.foo()) {
System.out.println("I.foo running");
}
before(): staticinitialization(!X) {
System.out.println("Clazz "+thisJoinPointStaticPart);
}
}


class Utils {
public static int compareByLength(String in, String out) {
return in.length() - out.length();
}
}

class MyClass {
public static String[] doSomething() {
String []args = new String[]{"4444","333","22","1"};
// Method reference
Arrays.sort(args,Utils::compareByLength);
return args;
}
}

+ 2
- 2
tests/features152/synchronization/transformed/expected/Investigation.c.txt View File

@@ -17,8 +17,8 @@
| | INVOKESPECIAL java.io.FileInputStream.<init> (Ljava/io/File;)V
| | POP
| catch java.io.IOException -> E0
| GOTO L0
| E0: POP (line 31)
| GOTO L0 (line 31)
| E0: POP
| GETSTATIC java.lang.System.out Ljava/io/PrintStream; (line 32)
| LDC "bang"
| INVOKEVIRTUAL java.io.PrintStream.println (Ljava/lang/String;)V

+ 2
- 2
tests/features152/synchronization/transformed/expected/One.c.txt View File

@@ -17,8 +17,8 @@
| | INVOKESPECIAL java.io.FileInputStream.<init> (Ljava/io/File;)V
| | POP
| catch java.io.IOException -> E0
| GOTO L0
| E0: POP (line 22)
| GOTO L0 (line 22)
| E0: POP
| GETSTATIC java.lang.System.out Ljava/io/PrintStream; (line 23)
| LDC "bang"
| INVOKESTATIC One.aspectOf ()LOne;

+ 30
- 0
tests/src/org/aspectj/systemtest/AllTests18.java View File

@@ -0,0 +1,30 @@
/*******************************************************************************
* Copyright (c) 2013 Contributors
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Andy Clement - initial API and implementation
*******************************************************************************/
package org.aspectj.systemtest;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.aspectj.systemtest.ajc180.AllTestsAspectJ180;

public class AllTests18 {

public static Test suite() {
TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.8");
// $JUnit-BEGIN$
suite.addTest(AllTestsAspectJ180.suite());
suite.addTest(AllTests17.suite());
suite.addTest(AllTests16.suite());
suite.addTest(AllTests15.suite());
// $JUnit-END$
return suite;
}
}

+ 4
- 3
tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java View File

@@ -540,9 +540,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("target(@Foo *)");
}

public void testErrorMessageOnITDWithTypePatterns() {
runTest("clear error message on itd with type pattern");
}
// ONE_EIGHT remove for now, needs some grammar changes to ensure empty type annotations are put in place for later consumption
// public void testErrorMessageOnITDWithTypePatterns() {
// runTest("clear error message on itd with type pattern");
// }

public void testAjKeywordsAsIdentifiers() {
runTest("before and after are valid identifiers in classes");

+ 2
- 0
tests/src/org/aspectj/systemtest/ajc153/ajc153.xml View File

@@ -286,7 +286,9 @@
<message kind="error" line="1" text="The import java.lang.retention cannot be resolved"/>
<message kind="error" line="3" text="Retention cannot be resolved to a type"/>
<message kind="error" line="3" text="RetentionPolicy cannot be resolved to a variable"/>
<!-- With 1.8 don't seem to get this now - assume it is because the annotation isn't being found
<message kind="error" line="3" text="The attribute value is undefined for the annotation type Retention"/>
-->
</compile>
</ajc-test>

+ 4
- 2
tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java View File

@@ -355,12 +355,14 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("debugging before advice - 2");
Method method = getMethodFromClass(getClassFrom(ajc.getSandboxDirectory(), "Foo2"), "foo");
// System.out.println(stringify(method.getLocalVariableTable()));
List l = sortedLocalVariables(method.getLocalVariableTable());
List<LocalVariable> l = sortedLocalVariables(method.getLocalVariableTable());
assertEquals("LBar; bar(1) start=0 len=34", stringify(l, 0));
assertEquals("Ljava/lang/Exception; e(3) start=29 len=4", stringify(l, 1));
assertEquals("LFoo2; this(0) start=0 len=34", stringify(l, 4));
assertEquals("Ljava/lang/String; s(2) start=15 len=19", stringify(l, 2));
assertEquals("Ljava/lang/String; s2(3) start=18 len=10", stringify(l, 3));
// With the 1.8 compiler looks like len=7 and not len=10 here, the goto to jump to the return is no longer included
// in the variable range
assertEquals("Ljava/lang/String; s2(3) start=18 len=7", stringify(l, 3));
}

// Two pieces of advice on before execution of a method with a this and a

+ 1
- 1
tests/src/org/aspectj/systemtest/ajc170/ajc170.xml View File

@@ -312,7 +312,7 @@
<ajc-test dir="bugs170/language" title="string switch 1">
<compile files="StringSwitch.java" options="-1.5">
<message kind="error" line="9" text="Cannot switch on a value of type String for source level below 1.7. Only convertible int values or enum constants are permitted"/>
<message kind="error" line="9" text="Cannot switch on a value of type String for source level below 1.7. Only convertible int values or enum variables are permitted"/>
</compile>
</ajc-test>


+ 39
- 0
tests/src/org/aspectj/systemtest/ajc180/Ajc180Tests.java View File

@@ -0,0 +1,39 @@
/*******************************************************************************
* Copyright (c) 2013 Contributors
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Andy Clement - initial API and implementation
*******************************************************************************/
package org.aspectj.systemtest.ajc180;

import java.io.File;

import junit.framework.Test;

import org.aspectj.testing.XMLBasedAjcTestCase;

/**
* @author Andy Clement
*/
public class Ajc180Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void testJava8Code() throws Exception {
runTest("first advised java 8 code");
}
// ---

public static Test suite() {
return XMLBasedAjcTestCase.loadSuite(Ajc180Tests.class);
}

@Override
protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc180/ajc180.xml");
}

}

+ 25
- 0
tests/src/org/aspectj/systemtest/ajc180/AllTestsAspectJ180.java View File

@@ -0,0 +1,25 @@
/*******************************************************************************
* Copyright (c) 2013 Contributors
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Andy Clement - initial API and implementation
*******************************************************************************/
package org.aspectj.systemtest.ajc180;

import junit.framework.Test;
import junit.framework.TestSuite;

public class AllTestsAspectJ180 {

public static Test suite() {
TestSuite suite = new TestSuite("AspectJ 1.8.0 tests");
// $JUnit-BEGIN$
suite.addTest(Ajc180Tests.suite());
// $JUnit-END$
return suite;
}
}

+ 25
- 0
tests/src/org/aspectj/systemtest/ajc180/ajc180.xml View File

@@ -0,0 +1,25 @@
<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>

<suite>

<ajc-test dir="bugs180/firstprogram" title="first advised java 8 code">
<compile files="C.java" options="-1.8">
</compile>
<run class="C">
<stdout>
<line text="Clazz staticinitialization(I.&lt;clinit&gt;)"/>
<line text="Clazz staticinitialization(C.&lt;clinit&gt;)"/>
<line text="I.foo running"/>
<line text="ABC"/>
<line text="hello world!"/>
<line text="Clazz staticinitialization(MyClass.&lt;clinit&gt;)"/>
<line text="Clazz staticinitialization(Utils.&lt;clinit&gt;)"/>
<line text="1"/>
<line text="22"/>
<line text="333"/>
<line text="4444"/>
</stdout>
</run>
</ajc-test>

</suite>

+ 4
- 1
tests/testsrc/org/aspectj/tests/TestsModuleTests.java View File

@@ -19,6 +19,7 @@ import junit.framework.TestSuite;
import org.aspectj.systemtest.AllTests;
import org.aspectj.systemtest.AllTests14;
import org.aspectj.systemtest.AllTests17;
import org.aspectj.systemtest.AllTests18;
import org.aspectj.util.LangUtil;

public class TestsModuleTests extends TestCase {
@@ -27,7 +28,9 @@ public class TestsModuleTests extends TestCase {
String name = TestsModuleTests.class.getName();
TestSuite suite = new TestSuite(name);
// compiler tests, wrapped for JUnit
if (LangUtil.is15VMOrGreater()) {
if (LangUtil.is18VMOrGreater()) {
suite.addTest(AllTests18.suite());
} else if (LangUtil.is15VMOrGreater()) {
// suite.addTest(AllTests15.suite());
suite.addTest(AllTests17.suite()); // there are currently (28/11/06) no tests specific to a 1.6/1.7 vm - so we can do
// this

+ 5
- 1
util/src/org/aspectj/util/LangUtil.java View File

@@ -74,7 +74,7 @@ public class LangUtil {
try {
String versionString = vm.substring(0, 3);
Double temp = new Double(Double.parseDouble(versionString));
vmVersion = temp.floatValue();
vmVersion = temp.doubleValue();
} catch (Exception e) {
vmVersion = 1.4;
}
@@ -106,6 +106,10 @@ public class LangUtil {
public static boolean is17VMOrGreater() {
return 1.7 <= vmVersion;
}
public static boolean is18VMOrGreater() {
return 1.8 <= vmVersion;
}

/**
* Shorthand for "if null, throw IllegalArgumentException"

+ 1
- 1
weaver/.classpath View File

@@ -13,6 +13,6 @@
<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
<classpathentry kind="lib" path="/lib/asm/asm-4.0.renamed.jar"/>
<classpathentry kind="lib" path="/lib/asm/asm-5.0_ALPHA.renamed.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

+ 2
- 2
weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java View File

@@ -50,7 +50,7 @@ public class StackMapAdder {
private static class AspectJClassVisitor extends ClassVisitor {

public AspectJClassVisitor(ClassVisitor classwriter) {
super(Opcodes.ASM4, classwriter);
super(Opcodes.ASM5, classwriter);
}

@Override
@@ -63,7 +63,7 @@ public class StackMapAdder {
// created by a ClassWriter (see top level class comment)
static class AJMethodVisitor extends MethodVisitor {
public AJMethodVisitor(MethodVisitor mv) {
super(Opcodes.ASM4,mv);
super(Opcodes.ASM5,mv);
}
}

Write Preview
Loading…
Cancel
Save