merged 1.1 branch into head

[mir.git] / source / mir / util / ParameterExpander.java

diff --git a/source/mir/util/ParameterExpander.java b/source/mir/util/ParameterExpander.java
index 734bec9..3077611 100755 (executable)
--- a/source/mir/util/ParameterExpander.java
+++ b/source/mir/util/ParameterExpander.java
@@ -29,11 +29,11 @@
  */
 package mir.util;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 import mir.generator.Generator;
 import mir.generator.GeneratorExc;
@@ -268,25 +268,25 @@ public class ParameterExpander {
   private static abstract class Token {
   }
 
-  public static abstract class PunctuationToken extends Token { public PunctuationToken() { }; }
-    private static class LeftSquareBraceToken extends PunctuationToken {};
-    private static class RightSquareBraceToken extends PunctuationToken {};
-    private static class EqualsToken extends PunctuationToken {};
-    private static class EqualsNotToken extends PunctuationToken {};
-    private static class NOTToken extends PunctuationToken {};
-    private static class LeftParenthesisToken extends PunctuationToken {};
-    private static class RightParenthesisToken extends PunctuationToken {};
-    private static class CommaToken extends PunctuationToken {};
-    private static class PeriodToken extends PunctuationToken {};
-    private static class PlusToken extends PunctuationToken {};
-    private static class TimesToken extends PunctuationToken {};
-    private static class DivideToken extends PunctuationToken {};
-    private static class MinusToken extends PunctuationToken {};
-    private static class ConcatenateToken extends PunctuationToken {};
-    private static class LessThanOrEqualsToken extends PunctuationToken {};
-    private static class GreaterThanOrEqualsToken extends PunctuationToken {};
-    private static class LessThanToken extends PunctuationToken {};
-    private static class GreaterThanToken extends PunctuationToken {};
+  public static abstract class PunctuationToken extends Token { public PunctuationToken() { } }
+    private static class LeftSquareBraceToken extends PunctuationToken {}
+    private static class RightSquareBraceToken extends PunctuationToken {}
+    private static class EqualsToken extends PunctuationToken {}
+    private static class EqualsNotToken extends PunctuationToken {}
+    private static class NOTToken extends PunctuationToken {}
+    private static class LeftParenthesisToken extends PunctuationToken {}
+    private static class RightParenthesisToken extends PunctuationToken {}
+    private static class CommaToken extends PunctuationToken {}
+    private static class PeriodToken extends PunctuationToken {}
+    private static class PlusToken extends PunctuationToken {}
+    private static class TimesToken extends PunctuationToken {}
+    private static class DivideToken extends PunctuationToken {}
+    private static class MinusToken extends PunctuationToken {}
+    private static class ConcatenateToken extends PunctuationToken {}
+    private static class LessThanOrEqualsToken extends PunctuationToken {}
+    private static class GreaterThanOrEqualsToken extends PunctuationToken {}
+    private static class LessThanToken extends PunctuationToken {}
+    private static class GreaterThanToken extends PunctuationToken {}
 
 
   private static class IdentifierToken extends Token {
@@ -448,7 +448,7 @@ public class ParameterExpander {
     public void skipWhitespace() {
       while (reader.hasNext() && Character.isWhitespace(reader.peek().charValue()))
         reader.getNext();
-    };
+    }
 
     private boolean isIdentifierStart(char c) {
       return Character.isLetter(c) || (c == '_');
@@ -576,7 +576,7 @@ public class ParameterExpander {
     private List parseList() {
       Token token;
       Object expression;
-      List result = new Vector();
+      List result = new ArrayList();
 
       token = scanner.scan();
       if (!(token instanceof LeftParenthesisToken)) {