Browse Source

Upgraded to Eclipse 3.0 final JDT core. v_449a_head_before_30_maintenance

tags/for_ajdt1_1_12
acolyer 20 years ago
parent
commit
2e8c6d5cc0
24 changed files with 9 additions and 10 deletions
  1. 2
    3
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
  2. 1
    3
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
  3. 5
    2
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
  4. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser1.rsc
  5. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser10.rsc
  6. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser11.rsc
  7. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser12.rsc
  8. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser13.rsc
  9. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser14.rsc
  10. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser15.rsc
  11. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser16.rsc
  12. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser17.rsc
  13. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser18.rsc
  14. 0
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser19.rsc
  15. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser2.rsc
  16. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser20.rsc
  17. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser3.rsc
  18. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser4.rsc
  19. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser5.rsc
  20. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser6.rsc
  21. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser7.rsc
  22. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser8.rsc
  23. BIN
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser9.rsc
  24. 1
    1
      org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java

+ 2
- 3
org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java View File

@@ -13,7 +13,6 @@ package org.aspectj.ajdt.core;
import java.util.Map;

import org.aspectj.ajdt.internal.core.builder.AjCompilerOptions;
import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.jdt.core.JavaCore;

/**
@@ -38,8 +37,8 @@ public class AspectJCore extends JavaCore {
public static final String COMPILER_REWEAVABLE = AjCompilerOptions.OPTION_XReweavable;
public static final String COMPILER_REWEAVABLE_COMPRESS = AjCompilerOptions.OPTION_XReweavableCompress;
public AspectJCore(IPluginDescriptor pluginDescriptor) {
super(pluginDescriptor);
public AspectJCore() {
super();
}
public static AspectJCore getAspectJCore() {

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

@@ -94,9 +94,7 @@ public class WeaverMessageHandler implements IMessageHandler {
severity,
startPos,
endPos,
sLoc != null ? sLoc.getLine() : 0,
referenceContext,
problemSource
sLoc != null ? sLoc.getLine() : 0
);
IProblem[] seeAlso = buildSeeAlsoProblems(message.getExtraSourceLocations(),
problemSource,

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

@@ -29,6 +29,7 @@ import org.eclipse.jdt.internal.compiler.flow.InitializationFlowContext;
import org.eclipse.jdt.internal.compiler.lookup.*;
import org.eclipse.jdt.internal.compiler.parser.Parser;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilation;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;

/**
* An inter-type method declaration.
@@ -75,7 +76,7 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration {
public void resolveStatements() {
if ((modifiers & AccSemicolonBody) != 0) {
if ((declaredModifiers & AccAbstract) == 0)
scope.problemReporter().methodNeedingAbstractModifier(this);
scope.problemReporter().methodNeedBody(this);
} else {
// the method HAS a body --> abstract native modifiers are forbiden
if (((declaredModifiers & AccAbstract) != 0))
@@ -105,7 +106,9 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration {
if (binding == null) {
// if binding is null, we failed to find a type used in the method params, this error
// has already been reported.
throw new AbortCompilation(compilationResult);
this.ignoreFurtherInvestigation = true;
//return null;
throw new AbortCompilationUnit(compilationResult,null);
}
ResolvedMember sig = new ResolvedMember(Member.METHOD, EclipseFactory.fromBinding(onTypeBinding),
declaredModifiers, EclipseFactory.fromBinding(binding.returnType), new String(declaredSelector),

BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser1.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser10.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser11.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser12.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser13.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser14.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser15.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser16.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser17.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser18.rsc View File


+ 0
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser19.rsc View File

@@ -1 +0,0 @@
]]IIIJJ^0003I[3000000Y!3M'Jdd

BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser2.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser20.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser3.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser4.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser5.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser6.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser7.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser8.rsc View File


BIN
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser9.rsc View File


+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java View File

@@ -602,7 +602,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
CompilerOptions options = compiler.options;

options.produceReferenceInfo(true); //TODO turn off when not needed
options.produceReferenceInfo = true; //TODO turn off when not needed
try {
compiler.compile(getCompilationUnits(filenames, encodings));

Loading…
Cancel
Save