X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java
index 45def4b..9f5bfa0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java
@@ -1,103 +1,58 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.ast;
 
-import net.sourceforge.phpdt.internal.compiler.CompilationResult;
-import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.lookup.*;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
-import net.sourceforge.phpdt.internal.compiler.util.*;
-
-public class MethodDeclaration extends AbstractMethodDeclaration {
-	
-	public TypeReference returnType;
-
-	/**
-	 * MethodDeclaration constructor comment.
-	 */
-	public MethodDeclaration(CompilationResult compilationResult) {
-		super(compilationResult);
-	}
-
-
-	public void parseStatements(Parser parser, CompilationUnitDeclaration unit) {
-
-		//fill up the method body with statement
-		if (ignoreFurtherInvestigation)
-			return;
-		parser.parse(this, unit);
-	}
-
-	public void resolveStatements(ClassScope upperScope) {
-
-		// ========= abort on fatal error =============
-		if (this.returnType != null && this.binding != null) {
-			this.returnType.binding = this.binding.returnType;
-			// record the return type binding
-		}
-		// look if the name of the method is correct
-		if (binding != null && isTypeUseDeprecated(binding.returnType, scope))
-			scope.problemReporter().deprecatedType(binding.returnType, returnType);
-
-		if (CharOperation.equals(scope.enclosingSourceType().sourceName, selector))
-			scope.problemReporter().methodWithConstructorName(this);
-
-		// by grammatical construction, interface methods are always abstract
-		if (!scope.enclosingSourceType().isInterface()){
-
-			// if a method has an semicolon body and is not declared as abstract==>error
-			// native methods may have a semicolon body 
-			if ((modifiers & AccSemicolonBody) != 0) {
-				if ((modifiers & AccNative) == 0)
-					if ((modifiers & AccAbstract) == 0)
-						scope.problemReporter().methodNeedingAbstractModifier(this);
-			} else {
-				// the method HAS a body --> abstract native modifiers are forbiden
-				if (((modifiers & AccNative) != 0) || ((modifiers & AccAbstract) != 0))
-					scope.problemReporter().methodNeedingNoBody(this);
-			}
-		}
-		super.resolveStatements(upperScope); 
-	}
-
-	public String returnTypeToString(int tab) {
-
-		if (returnType == null)
-			return ""; //$NON-NLS-1$
-		return returnType.toString(tab) + " "; //$NON-NLS-1$
-	}
-
-	public void traverse(
-		IAbstractSyntaxTreeVisitor visitor,
-		ClassScope classScope) {
-
-		if (visitor.visit(this, classScope)) {
-			if (returnType != null)
-				returnType.traverse(visitor, scope);
-			if (arguments != null) {
-				int argumentLength = arguments.length;
-				for (int i = 0; i < argumentLength; i++)
-					arguments[i].traverse(visitor, scope);
-			}
-			if (thrownExceptions != null) {
-				int thrownExceptionsLength = thrownExceptions.length;
-				for (int i = 0; i < thrownExceptionsLength; i++)
-					thrownExceptions[i].traverse(visitor, scope);
-			}
-			if (statements != null) {
-				int statementsLength = statements.length;
-				for (int i = 0; i < statementsLength; i++)
-					statements[i].traverse(visitor, scope);
-			}
-		}
-		visitor.endVisit(this, classScope);
-	}
-}
\ No newline at end of file
+/**
+ * A Method declaration.
+ * @author Matthieu Casanova
+ */
+public class MethodDeclaration extends Statement {
+
+  public char[] name;
+  public ArgumentDeclaration[] arguments;
+  public Statement[] statements;
+  public int bodyStart;
+  public int bodyEnd = -1;
+  public boolean isConstructor;
+
+  /**
+   * Return method into String, with a number of tabs
+   * @param tab the number of tabs
+   * @return the String containing the method
+   */
+  public String toString(int tab) {
+    String s = tabString(tab);
+    StringBuffer buff = new StringBuffer(s);
+    buff.append(name).append("(");//$NON-NLS-1$
+
+    if (arguments != null) {
+      for (int i = 0; i < arguments.length; i++) {
+        buff.append(arguments[i].toString(0));
+        if (i != (arguments.length - 1)) {
+          buff.append(", "); //$NON-NLS-1$
+        }
+      }
+    }
+    buff.append(")"); //$NON-NLS-1$
+
+    s += toStringStatements(tab + 1);
+    return s;
+  }
+
+  /**
+   * Return the statements of the method into Strings
+   * @param tab the number of tabs
+   * @return the String containing the statements
+   */
+  public String toStringStatements(int tab) {
+    StringBuffer buff = new StringBuffer(" {"); //$NON-NLS-1$
+    if (statements != null) {
+      for (int i = 0; i < statements.length; i++) {
+        buff.append("\n").append(statements[i].toString(tab)); //$NON-NLS-1$
+        if (!(statements[i] instanceof Block)) {
+          buff.append(";"); //$NON-NLS-1$
+        }
+      }
+    }
+    buff.append("\n").append(tabString(tab == 0 ? 0 : tab - 1)).append("}"); //$NON-NLS-2$ //$NON-NLS-1$
+    return buff.toString();
+  }
+}