merged 1.1 branch into head

[mir.git] / source / mir / generator / GeneratorLibraryRepository.java

diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java
index 7ee9630..1f594fe 100755 (executable)
--- a/source/mir/generator/GeneratorLibraryRepository.java
+++ b/source/mir/generator/GeneratorLibraryRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2005 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,19 +18,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License.
+ * You must obey the GNU General Public License in all respects for all of the code used
+ * other than the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.generator;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Arrays;
 
 import mir.log.LoggerWrapper;
 import mir.util.SimpleParser;
@@ -90,12 +88,16 @@ public class GeneratorLibraryRepository {
           parser.skip(SPACE);
 
           if (!parser.isAtEnd()) {
-            parser.parse(SEMICOLON, "; expected");
+            parser.parse(SEMICOLON, "';' expected");
           }
         }
       }
       catch (Exception e) {
-        throw new GeneratorFailure("Failed to construct generator library: " + e.getMessage(), e);
+        logger.error("Failed to parse generator library expression " +
+            Arrays.asList(aSpecification).toString(), e);
+
+        throw new GeneratorFailure("Failed to parse generator library expression " +
+            Arrays.asList(aSpecification).toString(), e);
       }
     }