restparam (varargs) support: (for docs not js..) http://wiki.ecmascript.org/doku.php?id=harmony:rest_parameters&s=rest

jcompagne · jcompagne · commit e96efca923a6 · 2010-12-09T13:41:04.000Z
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/JSDocSupport.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/JSDocSupport.java
@@ -111,10 +111,15 @@ private void parseParams(IMethod method, String comment) {
 					index + PARAM_TAG.length(), endLineIndex);
 			StringTokenizer st = new StringTokenizer(parameterString);
 			String type = null;
+			boolean varargs = false;
 			while (st.hasMoreTokens()) {
 				final String token = st.nextToken();
 				if (token.startsWith("{") && token.endsWith("}")) {
 					type = token.substring(1, token.length() - 1);
+					if (type.startsWith("...")) {
+						varargs = true;
+						type = type.substring(3);
+					}
 				} else {
 					final IParameter parameter;
 					boolean optional = false;
@@ -164,6 +169,7 @@ private void parseParams(IMethod method, String comment) {
 								&& st.nextToken().equals("optional"))
 							optional = true;
 						parameter.setOptional(optional);
+						parameter.setVarargs(varargs);
 					}
 					break;
 				}
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/JSMethod.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/ti/JSMethod.java
@@ -103,6 +103,7 @@ private static class Parameter implements IParameter {
 		private ReferenceLocation location = ReferenceLocation.UNKNOWN;
 		private boolean optional;
 		private Type propertiesType;
+		private boolean varargs;
 
 		public String getName() {
 			return name;
@@ -136,6 +137,14 @@ public boolean isOptional() {
 			return optional;
 		}
 
+		public void setVarargs(boolean varargs) {
+			this.varargs = varargs;
+		}
+
+		public boolean isVarargs() {
+			return varargs;
+		}
+
 		public Type getPropertiesType() {
 			return propertiesType;
 		}
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/validation/TypeInfoValidator.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/internal/javascript/validation/TypeInfoValidator.java
@@ -456,40 +456,68 @@ private void reportMethodParameterError(ASTNode methodNode,
 
 		private boolean validateParameters(List<IParameter> parameters,
 				IValueReference[] arguments) {
-			if (arguments.length > parameters.size())
+			if (arguments.length > parameters.size()
+					&& !(parameters.size() > 0 && parameters.get(
+							parameters.size() - 1).isVarargs()))
 				return false;
 			int testTypesSize = parameters.size();
-			if (parameters.size() != arguments.length) {
+			if (parameters.size() > arguments.length) {
 				for (int i = arguments.length; i < parameters.size(); i++) {
 					if (!parameters.get(i).isOptional())
 						return false;
 				}
 				testTypesSize = arguments.length;
+			} else if (parameters.size() < arguments.length) {
+				// is var args..
+				testTypesSize = parameters.size() - 1;
 			}
 
 			for (int i = 0; i < testTypesSize; i++) {
-				String param = parameters.get(i).getType();
-				if (arguments[i] == null)
-					continue;
-				Type argumentType = arguments[i].getDeclaredType();
-				if (argumentType == null) {
-					if (!arguments[i].getTypes().isEmpty()) {
-						argumentType = arguments[i].getTypes().iterator()
-								.next();
-					}
-				}
-				if (param != null && param != null
-						&& argumentType != null
-						&& !param.equals(argumentType.getName())) {
-					String argumentName = argumentType.getName();
-					int index = argumentName.indexOf('<');
-					if (index != -1) {
-						argumentName = argumentName.substring(0, index);
-					}
-					if (param.equals(argumentName))
-						continue;
+				String paramType = parameters.get(i).getType();
+				IValueReference argument = arguments[i];
+				if (!testArgumentType(paramType, argument))
 					return false;
+			}
+			// test var args
+			if (parameters.size() < arguments.length) {
+				int varargsParameter = parameters.size() - 1;
+				String paramType = parameters.get(varargsParameter).getType();
+
+				for (int i = varargsParameter; i < arguments.length; i++) {
+					IValueReference argument = arguments[i];
+					if (!testArgumentType(paramType, argument))
+						return false;
+				}
+
+			}
+			return true;
+		}
+
+		/**
+		 * @param paramType
+		 * @param argument
+		 * @return
+		 */
+		private boolean testArgumentType(String paramType,
+				IValueReference argument) {
+			if (argument == null)
+				return true;
+			Type argumentType = argument.getDeclaredType();
+			if (argumentType == null) {
+				if (!argument.getTypes().isEmpty()) {
+					argumentType = argument.getTypes().iterator().next();
+				}
+			}
+			if (paramType != null && paramType != null && argumentType != null
+					&& !paramType.equals(argumentType.getName())) {
+				String argumentName = argumentType.getName();
+				int index = argumentName.indexOf('<');
+				if (index != -1) {
+					argumentName = argumentName.substring(0, index);
 				}
+				if (paramType.equals(argumentName))
+					return true;
+				return false;
 			}
 			return true;
 		}
@@ -524,7 +552,13 @@ private String describeParamTypes(List<IParameter> parameters) {
 					sb.append(',');
 				}
 				if (parameter.getType() != null) {
+					if (parameter.isOptional())
+						sb.append("[");
+					if (parameter.isVarargs())
+						sb.append("...");
 					sb.append(parameter.getType());
+					if (parameter.isOptional())
+						sb.append("]");
 				} else {
 					sb.append('?');
 				}
diff --git a/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/IModelBuilder.java b/plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/IModelBuilder.java
@@ -70,6 +70,16 @@ public interface IParameter extends IElement {
 		 */
 		boolean isOptional();
 
+		/**
+		 * @since 3.0
+		 */
+		void setVarargs(boolean varargs);
+
+		/**
+		 * @since 3.0
+		 */
+		boolean isVarargs();
+
 		/**
 		 * @since 3.0
 		 */
