X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmir%2Futil%2FParameterExpander.java;h=6f96209f5034c27c25a360cb58d39fd020b40fb5;hb=3da84ce0196319b33211328515e3ca12b422c95c;hp=b4b6ad41d4573b95df02aedffefc6949c06d5d1c;hpb=d388c9c6286a9d9dda70e05535d5321fc20ef1c8;p=mir.git

diff --git a/source/mir/util/ParameterExpander.java b/source/mir/util/ParameterExpander.java
index b4b6ad41..6f96209f 100755
--- a/source/mir/util/ParameterExpander.java
+++ b/source/mir/util/ParameterExpander.java
@@ -31,12 +31,16 @@
 
 package mir.util;
 
-import multex.Failure;
+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;
 import multex.Exc;
 
-import java.util.*;
-import mir.generator.*;
-
 public class ParameterExpander {
   final static String NODE_SEPARATOR = ".";
   final static char STRING_ESCAPE_CHARACTER = '\\';
@@ -593,7 +597,7 @@ public class ParameterExpander {
             currentValue = ((Map) currentValue).get(qualifier);
           }
           else {
-            throw new RuntimeException("cannot reference into anything other than a map");
+            throw new RuntimeException("cannot reference into anything other than a map ('"+qualifier+"')");
           }
         }
         else if (token instanceof IdentifierToken) {
@@ -604,7 +608,7 @@ public class ParameterExpander {
             currentValue = ((Map) currentValue).get(qualifier);
           }
           else {
-            throw new RuntimeException("cannot reference into anything other than a map");
+            throw new RuntimeException("cannot reference into anything other than a map ('"+qualifier+"')");
           }
         }
         else if (token instanceof LeftParenthesisToken) {
@@ -687,7 +691,7 @@ public class ParameterExpander {
       return value;
     }
 
-    private static final int MAX_OPERATOR_LEVEL = 1000;               // && || !
+    private static final int MAX_OPERATOR_LEVEL = 1000;                //
     private static final int LOGICAL_OPERATOR_LEVEL = 5;               // && || !
     private static final int COMPARISON_OPERATOR_LEVEL = 4;            // == <= >= in < >
     private static final int ADDITION_OPERATOR_LEVEL = 3;              // + - &