From c737ebb8fbaeff75e8914a695951be466cf3d695 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 31 Dec 2016 20:35:50 +0100 Subject: [PATCH] nyacc: c99: always expand cpp conditionals. * module/nyacc/lang/c99/body.scm (gen-c-lexer): Always expand conditionals. --- module/nyacc/lang/c99/body.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/nyacc/lang/c99/body.scm b/module/nyacc/lang/c99/body.scm index b3e7843..a881849 100644 --- a/module/nyacc/lang/c99/body.scm +++ b/module/nyacc/lang/c99/body.scm @@ -319,7 +319,7 @@ (rem-define (cadr stmt))) ((if) ;; and ifdef, ifndef (cpi-push) - (if (eval-flow?) + (if #t ;;(eval-flow?) (let* ((defs (cpi-defs info)) (rhs (cpp-expand-text (cadr stmt) defs)) ;; rhs = "defined(1)" :( @@ -333,7 +333,7 @@ (else (set! skip (cons* 'skip-one (car skip) skip))))))) ((elif) - (if (eval-flow?) + (if #t ;;(eval-flow?) (let* ((defs (cpi-defs info)) (rhs (cpp-expand-text (cadr stmt) defs)) (exp (parse-cpp-expr rhs)) @@ -353,7 +353,7 @@ (set! skip (cons* 'skip-one 'skip (cdr skip)))))) (cpi-shift))) ((else) - (if (eval-flow?) + (if #t ;; (eval-flow?) (cond ((eq? 'skip-look (car skip)) (cpi-shift) @@ -363,7 +363,7 @@ (cpi-shift))) ((endif) (cpi-pop) - (if (eval-flow?) + (if #t ;; (eval-flow?) (set! skip (cons 'skip-one (cdr skip))))) ((error) stmt) -- 2.10.2