Syntax coloring works

bracket/bracket.rkt

@@ -53,6 +53,8 @@
 ;   expression u itself or an operand of some
 ;   operator in u.
 
+
+
 (module number-theory racket/base
   (provide binomial)
   

bracket/lang/parser.rkt

@@ -24,7 +24,6 @@
 ;      | ( <e> )                 grouping
 ;      | <id> ( <args> ) := <e>  function definition
 
-
 ; <id>   An identifier begins with a letter, 
 ;        and is optionally followed by series of letters, digits or underscores.
 ;        An underscore is converted to a -. Thus list_ref will refer to list-ref.
@@ -134,36 +133,39 @@
 ; - A number representing the starting position of the match (or #f if eof).
 ; - A number representing the ending position of the match (or #f if eof).
 
+(define (syn-val a b c d e)
+  (values a b c 
+          (position-offset d)
+          #;(position-offset e) 
+          (max (position-offset e)
+               (+ (position-offset d) 1))))
+
 (define color-lexer
-  (lexer-src-pos
+  (lexer
    [(eof)
-    (values eof #f #f start-pos end-pos)]
+    (syn-val lexeme 'eof #f start-pos end-pos)]
    [(:or #\tab #\space #\newline)
-    (values lexeme 'white-space #f start-pos end-pos)]
-   [#\newline 
-    (begin
-      (/ 0 0)
-      (values lexeme 'white-space #f start-pos end-pos))]
+    (syn-val lexeme 'white-space #f start-pos end-pos)]   
    [(:or ":=" "+" "-" "*" "/" "^" "<" ">" "=" "\"") 
-    (values lexeme 'symbol #f start-pos end-pos)]
+    (syn-val lexeme 'symbol #f start-pos end-pos)]
    [(:or "(" ")" "[" "]" "{" "}")
-    (values lexeme 'parenthesis #f start-pos end-pos)]
+    (syn-val lexeme 'parenthesis #f start-pos end-pos)]
    [(:or "[[" "," ";" "." "λ" "lambda" "√" "¬" "≤" "<=" "≥" ">=" "<>" "≠")
-    (values lexeme 'no-color #f start-pos end-pos)]
+    (syn-val lexeme 'no-color #f start-pos end-pos)]
    ["define"
-    (values lexeme 'constant (/ 0 0) start-pos end-pos)]
+    (syn-val lexeme 'constant #f start-pos end-pos)]
    [string 
-    (values lexeme 'string #f start-pos end-pos)]
+    (syn-val lexeme 'string #f start-pos end-pos)]
    ; The parser can only look ahead 1 token, so we have 3 
    ; different identifiers to see whether := or ( comes after the identfier.
    ; This is enough to prevent shift/reduce conflicts between atom, definition,
    ; and application.
    [(:or identifier:= identifierOP identifier)
-    (values lexeme 'symbol #f start-pos end-pos)]
+    (syn-val lexeme 'symbol #f start-pos end-pos)]
    [(:+ digit) 
-    (values lexeme 'constant #f start-pos end-pos)]
+    (syn-val lexeme 'constant #f start-pos end-pos)]
    [(:: (:+ digit) #\. (:* digit)) 
-    (values lexeme 'constant #f start-pos end-pos)]))
+    (syn-val lexeme 'constant #f start-pos end-pos)]))
 
 
 ;; A macro to build the syntax object
@@ -224,7 +226,6 @@
 (define the-parser
   (parser
    (src-pos)
-   ; (suppress)  ; hmm...
    ;(debug "parser-dump.txt")
    ;(yacc-output "parser-dump.yacc")
    (start start)
@@ -249,18 +250,7 @@
              (position-line start)
              (position-col start)
              (position-offset start)
-             (+ (- (position-offset end) (position-offset start))))
-            #;(raise-syntax-error
-               #f
-               "syntax error"
-               (datum->syntax 
-                #'here 'here
-                (list 
-                 source-name 
-                 (position-line start)
-                 (position-col start)
-                 (position-offset start)
-                 (+ (- (position-offset end) (position-offset start))))))))
+             (+ (- (position-offset end) (position-offset start))))))
    
    (precs ; (left :=)
           ; (right OP)          

bracket/lang/reader.rkt

@@ -1,16 +1,8 @@
 #lang racket
-; #lang s-exp syntax/module-reader
-; bracket
-; #:read                bracket-read
-; #:read-syntax         bracket-read-syntax
-; #:whole-body-readers? #t
-; #:info                get-info
-; #:language-info       #(bracket/bracket-info get-language-info #f)
-
 (provide (rename-out 
-            [bracket-read read]
-            [bracket-read-syntax read-syntax])
-           get-info)
+          [bracket-read read]
+          [bracket-read-syntax read-syntax])
+         get-info)
 
 (require "parser.rkt")
 (require syntax/strip-context)
@@ -20,7 +12,6 @@
    (bracket-read-syntax #'from-my-read in)))
 
 (define (bracket-read-syntax src in)
-  (displayln 'bracket-read-syntax)
   (define out
   (if (eof-object? (peek-byte in))
       eof
@@ -49,7 +40,7 @@
                          (build-path base "../bracket.rkt"))))])
         (syntax-property 
          (strip-context   
-          #'(module main bracket/bracket-lang ; "bracket-lang.rkt" ; (file bracket-lang)
+          #'(module main bracket/bracket-lang
               (require (submod (file bracket.rkt) bracket)
                        (submod (file bracket.rkt) symbolic-application))
               (define-syntax (#%infix stx)
@@ -69,36 +60,15 @@
               body))
          'module-language
          '#(bracket/bracket-info get-language-info #f)))))
-  ;(write (syntax->datum out))
-  (write out)
-  (newline)
+  ; DEBUG This line displays the syntax object returned by the reader.
+  ;   (write out) (newline)
   out)
 
-
-;(require racket/runtime-path)
-;(define-runtime-path color-lexer-path "parser.rkt")
-;(write color-lexer-path)
-
 (define (get-info in mod line col pos)
-  (displayln (list 'reader/get-info in mod line col pos))
   (lambda (key default)
-    (displayln (list  'reader/get-info  key default))
     (case key
       [(color-lexer)
        (dynamic-require 'bracket/lang/parser 'color-lexer)]
       [else default])))
 
-#;(define (get-info in mod line col pos)
-  (/ 0 0)
-  (lambda (key default)
-    (/ 0 0)
-    (case key
-      [(color-lexer)
-       #;(dynamic-require 'syntax-color/default-lexer
-                        'default-lexer)
-       (displayln "HErE")
-       (dynamic-require "parser.rkt"
-                        'color-lexer)]
-      [else default])))
 
-;(require syntax-color/default-lexer)