added small modification to varargs to make it more 1.3 compatible and avoid lack of support of isVarArgs() is some Java 1.5 betas

moez · moez · commit f8d50a718270 · 2004-09-04T21:21:17.000Z
git-svn-id: file:///tmp/test-svn/trunk@2702 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/Version.java b/dynamicjava/src/koala/Version.java
@@ -53,7 +53,7 @@
  * This file is copied to Version.java by the build process, which also
  * fills in the right values of the date and time.
  *
- * This javadoc corresponds to build drjava-20040831-2058;
+ * This javadoc corresponds to build drjava-20040904-2117;
  *
  * @version $Id$
  */
@@ -62,7 +62,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String BUILD_TIME_STRING = "20040831-2058";
+  private static final String BUILD_TIME_STRING = "20040904-2117";
 
   /** A {@link Date} version of the build time. */
   private static final Date BUILD_TIME = _getBuildDate();
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/ClassInfoCompiler.java b/dynamicjava/src/koala/dynamicjava/interpreter/ClassInfoCompiler.java
@@ -1832,7 +1832,7 @@ public Void visit(FieldDeclaration node) {
      */
     public Void visit(MethodDeclaration node) {
       if(node.isVarArgs())
-        TigerUtilities.assertTigerEnabled("Methods with variable arguments are only allowed in Java 1.5 or better");
+        TigerUtilities.assertTigerEnabled("Methods with variable arguments are only allowed in Java 1.5 or higher");
       MethodInfo mi         = classInfo.getMethod(node);
       int        af         = mi.getModifiers();
       String     mn         = node.getName();
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java
@@ -4,25 +4,25 @@
  * http://sourceforge.net/projects/drjava/ or http://www.drjava.org/
  *
  * DrJava Open Source License
- * 
+ *
  * Copyright (C) 2001-2003 JavaPLT group at Rice University (javaplt@rice.edu)
  * All rights reserved.
  *
  * Developed by:   Java Programming Languages Team
  *                 Rice University
  *                 http://www.cs.rice.edu/~javaplt/
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a 
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
- * to deal with the Software without restriction, including without 
- * limitation the rights to use, copy, modify, merge, publish, distribute, 
- * sublicense, and/or sell copies of the Software, and to permit persons to 
- * whom the Software is furnished to do so, subject to the following 
+ * to deal with the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, subject to the following
  * conditions:
- * 
- *     - Redistributions of source code must retain the above copyright 
+ *
+ *     - Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimers.
- *     - Redistributions in binary form must reproduce the above copyright 
+ *     - Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimers in the
  *       documentation and/or other materials provided with the distribution.
  *     - Neither the names of DrJava, the JavaPLT, Rice University, nor the
@@ -32,15 +32,15 @@
  *       use the term "DrJava" as part of their names without prior written
  *       permission from the JavaPLT group.  For permission, write to
  *       javaplt@rice.edu.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS WITH THE SOFTWARE.
- * 
+ *
 END_COPYRIGHT_BLOCK*/
 
 package koala.dynamicjava.interpreter;
@@ -69,7 +69,7 @@
  */
 
 public class TypeChecker14 extends AbstractTypeChecker {
-  
+
   /**
    * Creates a new name visitor
    * @param ctx the context
@@ -83,18 +83,18 @@ public TypeChecker14(Context ctx) {
    * @param node the node to visit
    */
   public Class<?> visit(ForEachStatement node){
-    throw new WrongVersionException("ForEach Statements are only supported in Java 1.5 or better");
+    throw new WrongVersionException("ForEach Statements are only supported in Java 1.5 or higher");
   }
 
   /**
    * Checks if the node is of GenericReference Type, which is only allowed in 1.5 or better
    * @param node the node being checked
-   */  
+   */
   protected void checkGenericReferenceType(ReferenceType node) {
    if(node instanceof GenericReferenceType)
      throw new WrongVersionException("Generics are not supported before Java 1.5");
   }
-  
+
   /**
    * Checks to see if the MethodDeclaration has variable arguments, which are only allowed in 1.5 or better
    * Note: the checkVarArgs here may or may not actually work. The test case in Distinction1415 failed when tiger features
@@ -104,28 +104,28 @@ protected void checkGenericReferenceType(ReferenceType node) {
    */
   protected void checkVarArgs(MethodDeclaration node) {
     if(node.isVarArgs())
-      throw new WrongVersionException("Methods with variable arguments are only allowed in Java 1.5 or better");
+      throw new WrongVersionException("Methods with variable arguments are only allowed in Java 1.5 or higher");
   }
-  
+
    /**
    * Visits a static import statement and throws an exception
    * @param node the ImportDeclaration node being checked
    */
   protected void staticImportHandler(ImportDeclaration node){
       throw new WrongVersionException("Static Import is not supported before Java 1.5");
   }
-  
-  
+
+
   /**
    * Boxing is not allowed prior to version 1.5. Throws an exception.
    * @param exp the expression to box
    * @param refType the reference type to box the primitive type to
    * @return the <code>SimpleAllocation</code> that boxes the expression
    */
   protected SimpleAllocation _box(Expression exp, Class<?> refType) {
-    throw new WrongVersionException("Box required to use " + refType + " here. Autoboxing requires minimum Java 1.5");
+    throw new WrongVersionException("Box required to use " + refType + " here. Autoboxing requires Java 1.5 or higher");
   }
-  
+
   /**
    * Unboxes the given expression by returning the correct
    * <code>ObjectMethodCall</code> corresponding to the given type
@@ -134,6 +134,6 @@ protected SimpleAllocation _box(Expression exp, Class<?> refType) {
    * @return The <code>ObjectMethodCall</code> that unboxes the expression
    */
   protected ObjectMethodCall _unbox(Expression child, Class<?> type) {
-    throw new WrongVersionException("Unbox required to use " + type + " here. Auto-unboxing requires minimum Java 1.5");
+    throw new WrongVersionException("Unbox required to use " + type + " here. Auto-unboxing requires Java 1.5 or higher");
   }
 }
diff --git a/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java b/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java
