1.1 restoration

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

diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java
index 3f19fc0..7ee9630 100755 (executable)
--- a/source/mir/generator/GeneratorLibraryRepository.java
+++ b/source/mir/generator/GeneratorLibraryRepository.java
@@ -44,15 +44,15 @@ public class GeneratorLibraryRepository {
     logger = new LoggerWrapper("Generator");
   }
 
-  public void registerLibraryFactory(String aName, Generator.GeneratorLibraryFactory aFactory) {
+  public void registerLibraryFactory(String aName, Generator.LibraryFactory aFactory) {
     factories.put(aName, aFactory);
   }
 
-  public Generator.GeneratorLibrary constructLibrary(String aName, String aParameters) throws GeneratorExc {
+  public Generator.Library constructLibrary(String aName, String aParameters) throws GeneratorExc {
     if (!factories.containsKey(aName))
       throw new GeneratorExc("Unknown library factory: "+aName);
 
-    return ((Generator.GeneratorLibraryFactory) factories.get(aName)).makeLibrary(aParameters);
+    return ((Generator.LibraryFactory) factories.get(aName)).makeLibrary(aParameters);
   }
 
   private final static String SPACE = "[\t\n\r ]*";
@@ -63,39 +63,40 @@ public class GeneratorLibraryRepository {
   private final static String FACTORY_PARAMETERS = "[^)]*";
   private final static String SEMICOLON = ";";
 
-  public Generator.GeneratorLibrary constructCompositeLibrary(String aSpecification) throws GeneratorExc, GeneratorFailure {
+  public Generator.Library constructCompositeLibrary(String aSpecification[]) throws GeneratorExc, GeneratorFailure {
     String identifier;
     String factory;
     String factoryParameters;
     CompositeGeneratorLibrary result = new CompositeGeneratorLibrary();
     boolean first=true;
 
-    SimpleParser parser = new SimpleParser(aSpecification);
-    try {
-      parser.skip(SPACE);
-      while (!parser.isAtEnd()) {
-        identifier = parser.parse(IDENTIFIER, "library key expected");
+    for (int i=0; i<aSpecification.length; i++) {
+      SimpleParser parser = new SimpleParser(aSpecification[i]);
+      try {
         parser.skip(SPACE);
-        parser.parse(EQUALS, "'=' expected");
-        parser.skip(SPACE);
-        factory = parser.parse(IDENTIFIER, "factory name expected");
-        parser.skip(SPACE);
-        parser.parse(LEFT_PARENTHESIS, "'(' expected");
-        factoryParameters = parser.parse(FACTORY_PARAMETERS, "parameters expected");
-        parser.parse(RIGHT_PARENTHESIS, "')' expected");
+        while (!parser.isAtEnd()) {
+          identifier = parser.parse(IDENTIFIER, "library key expected");
+          parser.skip(SPACE);
+          parser.parse(EQUALS, "'=' expected");
+          parser.skip(SPACE);
+          factory = parser.parse(IDENTIFIER, "factory name expected");
+          parser.skip(SPACE);
+          parser.parse(LEFT_PARENTHESIS, "'(' expected");
+          factoryParameters = parser.parse(FACTORY_PARAMETERS, "parameters expected");
+          parser.parse(RIGHT_PARENTHESIS, "')' expected");
 
-        result.addLibrary(identifier, constructLibrary(factory, factoryParameters), first);
-        first=false;
-        parser.skip(SPACE);
+          result.addLibrary(identifier, constructLibrary(factory, factoryParameters), first);
+          first=false;
+          parser.skip(SPACE);
 
-        if (!parser.isAtEnd()) {
-          parser.parse(SEMICOLON, "; expected");
+          if (!parser.isAtEnd()) {
+            parser.parse(SEMICOLON, "; expected");
+          }
         }
       }
-    }
-    catch (Exception e) {
-      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-      throw new GeneratorFailure("Failed to construct generator library: " + e.getMessage(), e);
+      catch (Exception e) {
+        throw new GeneratorFailure("Failed to construct generator library: " + e.getMessage(), e);
+      }
     }
 
     return result;