From 19559b74b433b1ab2067457bf22e6b1f1ae85b09 Mon Sep 17 00:00:00 2001
From: Scott Owens <sowens@cs.utah.edu>
Date: Sat, 27 Apr 2002 22:51:40 +0000
Subject: [PATCH] *** empty log message ***

original commit: 12d65914f68bdb255ee8071688a246f0b404b893
---
 collects/parser-tools/examples/calc.ss |  3 ++-
 collects/parser-tools/examples/read.ss | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/collects/parser-tools/examples/calc.ss b/collects/parser-tools/examples/calc.ss
index 0d5583d..3f0f125 100644
--- a/collects/parser-tools/examples/calc.ss
+++ b/collects/parser-tools/examples/calc.ss
@@ -84,6 +84,7 @@
            
 ;; run the calculator on the given input-port       
 (define (calc ip)
+  (port-count-lines! ip)
   (letrec ((one-line
 	    (lambda ()
 	      (let ((result (calcp (lambda () (calcl ip)))))
@@ -91,4 +92,4 @@
 		    (begin
 		      (printf "~a~n" result)
 		      (one-line)))))))
-    (one-line))))
+    (one-line)))
diff --git a/collects/parser-tools/examples/read.ss b/collects/parser-tools/examples/read.ss
index 35096e3..853ff14 100644
--- a/collects/parser-tools/examples/read.ss
+++ b/collects/parser-tools/examples/read.ss
@@ -12,7 +12,7 @@
   
   (define-tokens data (DATUM))
   (define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF))
-  
+
   (define scheme-lexer
     (lexer-src-pos
      
@@ -53,10 +53,10 @@
   
   (define-lex-abbrevs
    [any (- #\000 #\377)]
-   [letter (: (- a z) (- A Z))]
+   [letter (: (- a z) (- #\A #\Z))]
    [digit (- #\0 #\9)]
    [whitespace (: #\newline #\return #\tab #\space #\vtab)]
-   [initial (: (letter) ! $ % & * / : < = > ? ^ _ ~)]
+   [initial (: (letter) ! $ % & * / : < = > ? ^ _ ~ @)]
    [subsequent (: (initial) (digit) + - #\. @)]
    [comment (@ #\; (* (^ #\newline)) #\newline)]
    
@@ -191,8 +191,8 @@
            #f
            value
            (list source 
-                 (position-line start-pos)
-                 (position-col start-pos)
+                 (add1 (position-line start-pos))
+                 (add1 (position-col start-pos))
                  (position-offset start-pos)
                  (- (position-offset end-pos)
                     (position-offset start-pos)))
@@ -233,12 +233,13 @@
                  [(sexp-list sexp) (cons $2 $1)]))))
   
   (define (rs sn ip off)
-    ((scheme-parser sn) (lambda () (scheme-lexer ip)))))
+    (port-count-lines! ip)
+    ((scheme-parser sn) (lambda () (scheme-lexer ip))))
   
   (define readsyntax
     (case-lambda ((sn) (rs sn (current-input-port) (list 0 0 0)))
                  ((sn ip) (rs sn ip (list 0 0 0)))
-                 ((sn ip off) (rs sn ip off))))
+		 ((sn ip off) (rs sn ip off))))
 
   (provide (rename readsyntax read-syntax))