import multiple replacements from ibex core

darcs-hash:20041209153238-2eb37-6d4c84605f2fa4abe202f5f71847ddd84f270ef4.gz

diff --git a/src/java/org/ibex/tool/Preprocessor.java b/src/java/org/ibex/tool/Preprocessor.java
index a1439b1..0df4c0f 100644 (file)
--- a/src/java/org/ibex/tool/Preprocessor.java
+++ b/src/java/org/ibex/tool/Preprocessor.java
@@ -111,7 +111,7 @@ public class Preprocessor {
     private PrintWriter out;
 
     private Hashtable replace = new Hashtable();
-    private Hashtable repeatreplace = null;
+    private Hashtable[] repeatreplaces = null;
     private Vector sinceLastRepeat = null;
     private Vector err = new Vector();
     private List defs;
@@ -196,12 +196,18 @@ PROCESS:
                     out.print("\n");  // preserve line numbers
                 }
                 StringTokenizer st = new StringTokenizer(trimmed, " ");
-                repeatreplace = (Hashtable)replace.clone();
+                repeatreplaces = null;
                 while (st.hasMoreTokens()) {
                     String tok = st.nextToken().trim();
                     String key = tok.substring(0, tok.indexOf('/'));
-                    String val = tok.substring(tok.indexOf('/') + 1);
-                    repeatreplace.put(key, val);
+                    String vals = tok.substring(tok.indexOf('/') + 1);
+                    StringTokenizer st2 = new StringTokenizer(vals,"/");
+                    if(repeatreplaces == null) {
+                        repeatreplaces = new Hashtable[st2.countTokens()];
+                        for(int i=0;i<repeatreplaces.length;i++) repeatreplaces[i] = (Hashtable) replace.clone();
+                    }
+                    for(int i=0;st2.hasMoreTokens() && i<repeatreplaces.length;i++)
+                        repeatreplaces[i].put(key, st2.nextToken());
                 }
                 sinceLastRepeat = new Vector();
                 out.print("\n"); // preserve line numbers
@@ -209,9 +215,11 @@ PROCESS:
             } else if (trimmed.startsWith("//#end")) {
                 if (sinceLastRepeat == null) { err.add(new Warning("#end orphaned")); continue PROCESS; }
                 Hashtable save = replace;
-                replace = repeatreplace;
                 out.print("\n");
-                for(int i=0; i<sinceLastRepeat.size() - 1; i++) out.print(processLine((String)sinceLastRepeat.elementAt(i), true));
+                for(int i=0;i<repeatreplaces.length;i++) {
+                    replace = repeatreplaces[i];
+                    for(int j=0; j<sinceLastRepeat.size() - 1; j++) out.print(processLine((String)sinceLastRepeat.elementAt(j), true));
+                }
                 sinceLastRepeat = null;
                 replace = save;
             } else if (trimmed.startsWith("//#ifdef")) {