From 3e4191b67051beee9c6e7828defa6e60793133fb Mon Sep 17 00:00:00 2001
From: Damien MATTEI <damien.mattei@gmail.com>
Date: Sun, 24 Nov 2024 17:50:25 +0100
Subject: [PATCH] compatible with executable pragma

---
 SRFI-105-curly-infix.rkt          | 32 ++++++++++++++++++++++++-------
 src/curly-infix2prefix4racket.rkt | 32 ++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/SRFI-105-curly-infix.rkt b/SRFI-105-curly-infix.rkt
index f9b51e3..02c2b16 100644
--- a/SRFI-105-curly-infix.rkt
+++ b/SRFI-105-curly-infix.rkt
@@ -16,6 +16,18 @@
 		 alternating-parameters)
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; globals variables that can be modified by coder
+(define srfi-strict #f) ; enable strict compatibility with SRFI 105
+
+(define care-of-quote #f) ; keep quoting expression (no $nfx$ will be inserted),
+;; usefull to use symbolic expressions
+;; (but makes debugging harder because quoted expression to debug will not be the same as executed)	
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
 
 ;; library procedures and macro
 (define insert cons)
@@ -143,11 +155,15 @@
 
 
   ; Given curly-infix lyst, map it to its final internal format.
-  (define (process-curly lyst)
-    (cond
-     ((not (pair? lyst)) lyst) ; E.G., map {} to ().
+(define (process-curly lyst)
+  
+  (cond
+   
+   ((not (pair? lyst)) lyst) ; E.G., map {} to ().
+   
      ((null? (cdr lyst)) ; Map {a} to a.
-       (car lyst))
+      (car lyst))
+     
      ((and (pair? (cdr lyst)) (null? (cddr lyst))) ; Map {a b} to (a b).
       lyst)
 
@@ -158,10 +174,12 @@
      
      ;; '{(2 + 3) - (5 - 7)}
      ;; '(- (2 + 3) (5 - 7))
-     ((and region-quote
-	   (simple-infix-list? lyst)) ; Map {a OP b [OP c...]} to (OP a b [c...])
+     ((and (simple-infix-list? lyst)
+	   (or (and care-of-quote
+		    region-quote)
+	       srfi-strict)) ; Map {a OP b [OP c...]} to (OP a b [c...])
       
-       (cons (cadr lyst) (alternating-parameters lyst)))
+      (cons (cadr lyst) (alternating-parameters lyst)))
      
      ;; comment above force this (which is not what i want):
      ;; > '{(2 + 3) - (5 - 7) - 2}
diff --git a/src/curly-infix2prefix4racket.rkt b/src/curly-infix2prefix4racket.rkt
index 14db09e..c6f5202 100755
--- a/src/curly-infix2prefix4racket.rkt
+++ b/src/curly-infix2prefix4racket.rkt
@@ -40,11 +40,13 @@
 
 (require srfi/31) ;; for 'rec in def.scm
 
+(require SRFI-105/SRFI-105-curly-infix)
 
 (define stderr (current-error-port))
 
+(define stdout (current-output-port))
+
 
-(include "SRFI-105.scm")
 
 (define srfi-105 #f)
 
@@ -126,24 +128,40 @@
   
   (skip-comments-and-empty-lines in)
 
+  ;; search for executable in racket
+  (let loop ()
+    (define try-read (regexp-try-match #px"^#![[:print:]]*racket" in))
+    (when  try-read
+	   (when verbose
+		 (display "try-read : |" stderr) (display try-read stderr) (display "|" stderr) (newline stderr))
+	   (display (car try-read) stdout)  ; re-put it on the output port as we need it in the parsed generated file
+	   (newline stdout)
+	   (loop)))
+
+  (skip-comments-and-empty-lines in)
+
+  ;; search for curly infix
   (let loop ()
     (when  (regexp-try-match #px"^#!curly-infix[[:blank:]]*\n" in)
       (loop)))
 
   (skip-comments-and-empty-lines in)
 
+  ;; search for a reader 
   (let loop ()
     (when  (regexp-try-match #px"^#lang reader SRFI-105[[:blank:]]*\n" in)
       ;;(display "srfi 105") (newline)
       (loop)))
 
   (skip-comments-and-empty-lines in)
-  
+
+  ;; search for R6RS
   (when (regexp-try-match #px"^#!r6rs[[:blank:]]*\n" in)
 	(set! flag-r6rs #t)
 	(display "Detected R6RS code: #!r6rs" stderr) (newline stderr) (newline stderr))
 
-  (define lc '())
+  ;; find where the port is set ,line ,column,etc
+  (define lc '()) ; line number
   (define cc '())
   (define pc '())
   (set!-values (lc cc pc) (port-next-location in))
@@ -168,7 +186,7 @@
 	(newline)
  	
 	(pretty-print result
-		      (current-output-port)
+		      stdout
 		      1)
 	;;(write result)
 	;;(newline)
@@ -185,7 +203,7 @@
 
 	(for/list ([expr result])
 		  (pretty-print expr
-				(current-output-port)
+				stdout
 				1))
 	
 	;; (if (not (null? (cdr result)))
@@ -250,7 +268,7 @@
 
 ;; (if lang-reader
 ;;     (pretty-print code-lst
-;; 		  (current-output-port)
+;; 		  stdout
 ;; 		  1) ;; quote-depth : remove global quote of expression
 
 
@@ -261,7 +279,7 @@
 ;; (display code-lst) (newline) (newline)
 
 ;; (for-each (lambda (expr) (pretty-print expr
-;; 				       (current-output-port)
+;; 				       stdout
 ;; 				       1)) ;; quote-depth : remove global quote of
 ;; 	  code-lst)