Fix #line

1 files changed, 21 insertions, 20 deletions

diff --git a/module/c/preprocessor2.scm b/module/c/preprocessor2.scm
index 2d2a9530..a6710314 100644
--- a/module/c/preprocessor2.scm
+++ b/module/c/preprocessor2.scm
@@ -464,27 +464,28 @@
   (typecheck environment cpp-environment?)
   (typecheck tokens* (list-of lexeme?))
 
-  ;; TODO rewrite without match
   (let loop ((%first-time #t) (tokens tokens*))
-    (match tokens
-      (`((preprocessing-token (pp-number ,line)) (whitespace ,_) ... rest ...)
-       (match rest
-         (`((preprocessing-token (string-literal ,file)) (whitespace ,_) ...)
-          (-> environment
-              (set current-line line)
-              (set current-file file)))
-         (`((whitespace ,_) ...)
-          (set environment current-line line))
-         (_ (unless %first-time
-              (scm-error 'cpp-error "handle-line-directive"
-                         "Invalid line directive: ~s"
-                         (list tokens*) #f))
-            (loop #f (resolve-token-stream environment tokens)))))
-      (_ (unless %first-time
-           (scm-error 'cpp-error "handle-line-directive"
-                      "Invalid line directive: ~s"
-                      (list tokens*) #f))
-         (loop #f (resolve-token-stream environment tokens))))))
+    (cond ((null? tokens))
+          ((number-token? (car tokens))
+           => (lambda (line)
+                (let ((line (string->number line)))
+                 (let ((remaining (drop-whitespace (cdr tokens))))
+                   (cond ((null? remaining) (set environment current-line line))
+                         ((string-token? (car remaining))
+                          => (lambda (file)
+                               (-> environment
+                                   (set current-line line)
+                                   (set current-file file))))
+                         (%first-time
+                          (loop #f (resolve-token-stream environment tokens)))
+                         (else (scm-error 'cpp-error "handle-line-directive"
+                                          "Invalid line directive: ~s"
+                                          (list tokens*) #f)
+                               ))))))
+          (%first-time (loop #f (resolve-token-stream environment tokens)))
+          (else (scm-error 'cpp-error "handle-line-directive"
+                           "Invalid line directive: ~s"
+                           (list tokens*) #f)))))
 
 ;; environment, tokens → environment
 (define (resolve-define environment tokens)