correctly output preprocessor errors

darcs-hash:20041209151955-2eb37-7925d9af73a3d22aee56c54c1504b1ab40711dc0.gz

diff --git a/src/java/org/ibex/tool/Compiler.java b/src/java/org/ibex/tool/Compiler.java
index b70859f..6d46890 100644 (file)
--- a/src/java/org/ibex/tool/Compiler.java
+++ b/src/java/org/ibex/tool/Compiler.java
@@ -276,7 +276,16 @@ public class Compiler {
                     }
 
                     if (err.size() > 0) {
-                        System.out.println("Preprocessor Errors, "+err); // FIXME
+                        for (int i=0; i < err.size(); i++) {
+                            Preprocessor.Warning warn = (Preprocessor.Warning)err.get(i);
+                            out.print(getFileName());
+                            out.print(':');
+                            out.print(warn.getLine());
+                            out.print(':');
+                            out.print(warn instanceof Preprocessor.Error ?
+                                      " error: " : " warning: ");
+                            out.println(warn.getMessage());
+                        }
                         return null;
                     }
 

diff --git a/src/java/org/ibex/tool/Preprocessor.java b/src/java/org/ibex/tool/Preprocessor.java
index 63cbf3d..a1439b1 100644 (file)
--- a/src/java/org/ibex/tool/Preprocessor.java
+++ b/src/java/org/ibex/tool/Preprocessor.java
@@ -538,6 +538,8 @@ PROCESS:
         public Warning() { msg = ""; }
         public Warning(String m) { msg = m; if (in != null) line = in.getLineNumber(); }
 
+        public int getLine() { return line; }
+        public String getMessage() { return msg; }
         public String toString() { return "WARNING Line "+line+": "+msg; }
     }