Improved error reporting of the Skribilo module reader.

* src/guile/skribilo/utils/syntax.scm (%skribilo-module-reader): Improved
  error reporting by showing the location of the unexpected character.

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-23

2 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 69447d0..132247b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-07-23 20:36:51 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-62
+
+    Summary:
+      Improved error reporting of the Skribilo module reader.
+    Revision:
+      skribilo--devel--1.2--patch-62
+
+    * src/guile/skribilo/utils/syntax.scm (%skribilo-module-reader): Improved
+      error reporting by showing the location of the unexpected character.
+
+    modified files:
+     ChangeLog src/guile/skribilo/utils/syntax.scm
+
+
 2006-07-23 14:38:34 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-61
 
     Summary:
diff --git a/src/guile/skribilo/utils/syntax.scm b/src/guile/skribilo/utils/syntax.scm
index 975b879..06c89bd 100644
--- a/src/guile/skribilo/utils/syntax.scm
+++ b/src/guile/skribilo/utils/syntax.scm
@@ -42,8 +42,15 @@
          '(colon-keywords no-scsh-block-comments
            srfi30-block-comments srfi62-sexp-comments)
          (lambda (chr port read)
-           (error "unexpected character in Skribilo module"
-                  chr))
+	   (let ((file (port-filename port))
+		 (line (port-line port))
+		 (column (port-column port)))
+	     (error (string-append
+		     (if (string? file)
+			 (format #f "~a:~a:~a: " file line column)
+			 "")
+		     "unexpected character in Skribilo module")
+		    chr)))
 
          ;; By default, don't record positions: this yields a nice read
          ;; performance improvement.