versions 10.8 Moved some n-arity code use from nfx to infix-with-precedence-to-prefix module.

Author: damien-mattei

README.md

@@ -25,11 +25,18 @@ code generated by the SRFI 105 Curly Infix parser and run it like a normal Racke
 Again you will have all the information about errors with the true line number displayed.
 Another method is to use the [Makefile](https://github.com/damien-mattei/Scheme-PLUS-for-Racket/blob/main/examples/racket/Makefile) provided (see docs).
 
+
+**Changes of version 10.8:**
+
+Only internal changes in code. Prepare for a greater upgrade.Moved some n-arity code use from nfx to infix-with-precedence-to-prefix module.
+Updated relatively with the code changes the personal internal documentation design of Scheme+ which is hosted in the Kawa Scheme+ project for historical reason.
+
+<br>
+
 **Changes of version 10.7:**
 
 No change in API but i removed depandancies between Scheme+  and SRFI-105-curly-infix that was alternating-parameters procedure. The procedure is now duplicated like it was in old versions. This is not elegant but remove dependancies that would lead in future version when i will use more scheme+ procedure in SRFI-105 parser in fatal circular dependancies.
 
-<br>
 
 **Changes of version 10.5:**
 

infix-with-precedence-to-prefix.rkt

@@ -41,6 +41,7 @@
 	   Scheme+/plus-minus-parser
 	   Scheme+/atom
 	   Scheme+/in-equalities
+	   Scheme+/n-arity
 	   ) 
 
 
@@ -426,44 +427,55 @@
 
   ;; we can check for expressions like 2<3<=3 here or later in the 'else of next 'if
 
-  (define rv
-
-    (begin
-      ;;(display "!*prec-generic-infix-parser : rv : deep-terms:") (display deep-terms) (newline)
-      ;; test for simple-infix (no operator precedence)
-      (if (simple-infix-list-syntax? deep-terms)
-	  
-	  (begin
-	    ;; (display "!*prec-generic-infix-parser : deep-terms is a simple infix list") (newline)
-	    ;; (display "!*prec-generic-infix-parser : deep-terms=") (display deep-terms) (newline)
-	    (return ;; list ; we put it in a list because rv2 take the car... or use return to skip list decapsulation
-	     (cons (cadr deep-terms) ; cadr is op in arg1 op arg2 op ....
-		   (alternating-parameters deep-terms)))) 
-
-	  (begin
-	    ;; (display "!*prec-generic-infix-parser : deep-terms is not a simple infix list") (newline)
-	    ;; (display "!*prec-generic-infix-parser : deep-terms=") (display deep-terms) (newline)
-	    ;; (newline)
-	    
-	    ;; we can check for expressions like 2<3<=3 here
-	    (when (multiple-in-equalities? deep-terms)
-	      (return (infix->prefix-in-equality deep-terms)))
+  ;;(display "!*prec-generic-infix-parser : rv : deep-terms:") (display deep-terms) (newline)
+  ;; test for simple-infix (no operator precedence)
+  (when (simple-infix-list-syntax? deep-terms)
+    ;; (display "!*prec-generic-infix-parser : deep-terms is a simple infix list") (newline)
+    ;; (display "!*prec-generic-infix-parser : deep-terms=") (display deep-terms) (newline)
+    (return ;; list ; we put it in a list because rv2 take the car... or use return to skip list decapsulation
+     (cons (cadr deep-terms) ; cadr is op in arg1 op arg2 op ....
+	   (alternating-parameters deep-terms)))) 
+  
+  ;; (display "!*prec-generic-infix-parser : deep-terms is not a simple infix list") (newline)
+  ;; (display "!*prec-generic-infix-parser : deep-terms=") (display deep-terms) (newline)
+  ;; (newline)
+	
+  ;; we can check for expressions like 2<3<=3 here
+  (when (multiple-in-equalities? deep-terms)
+    (return (infix->prefix-in-equality deep-terms)))
 
-	    (when (not (infix-canonical? deep-terms))
-	      (error "infix-with-precedence-to-prefix.rkt : !*prec-generic-infix-parser : not a canonical infix expression: " deep-terms))
+  (when (not (infix-canonical? deep-terms))
+    (error "infix-with-precedence-to-prefix.rkt : !*prec-generic-infix-parser : not a canonical infix expression: " deep-terms))
 
-            (pre-check-!*-generic-infix-parser deep-terms creator)))))
+  (define rv (pre-check-!*-generic-infix-parser deep-terms creator))
 
 
   ;; (display "!*prec-generic-infix-parser : rv=") (display rv) (newline)
 
   ;; (newline)
   ;; (newline)
 
-  (define rv2 (car rv))
-  ;;(display "!*prec-generic-infix-parser : (car rv) = rv2 =") (display rv2) (newline)
+  (define expr (car rv))
+  ;;(display "!*prec-generic-infix-parser : (car rv) = expr =") (display expr) (newline)
+
+  ;; TODO pass to n-arity also arithmetic expressions (+ , * , ...) note: fail with n-arity
+  ;; note: some overloaded arithmetic operator could not have implemented the n-arity
+  ;; perheaps write this in another module ,sort of !*post-generic-infix-parser
+  (if ;;(not (isEXPONENTIAL? expr))
+   (or (isDEFINE? expr)
+       (isASSIGNMENT? expr))
+   
+   ;;  make n-arity for <- and <+ only (because could be false with ** , but not implemented in n-arity for now)
+   ;; (begin
+   ;; 	 (display "!*prec-generic-infix-parser : calling n-arity on expr :") (display expr) (newline) 
+   (n-arity ;; this avoids : '{x <- y <- z <- t <- u <- 3 * 4 + 1}
+    ;; SRFI-105.scm : !0 result = (<- (<- (<- (<- (<- x y) z) t) u) (+ (* 3 4) 1)) ;; fail set! ...
+    ;; transform in : '(<- x y z t u (+ (* 3 4) 1))
+            expr) ;) ; end begin
+   
+   expr)
 
-  rv2)
+  ) ; end def
 
 
 

info.rkt

@@ -11,7 +11,7 @@
 	       "SRFI-105-for-Racket"
 	       "try-catch"))
 (define pkg-desc "Scheme+ for Racket")
-(define version "10.7")
+(define version "10.8")
 (define pkg-authors '(mattei))
 (define scribblings '(("scribblings/scheme-plus.scrbl" ())))
 (define build-deps '("scribble-lib" "racket-doc" "scribble-code-examples" "scribble-doc"))

nfx.rkt

@@ -21,7 +21,7 @@
 
 	(provide $nfx$)
 
-  (require (for-syntax Scheme+/n-arity)
+  (require ;(for-syntax Scheme+/n-arity)
 	   (for-syntax Scheme+/infix-with-precedence-to-prefix)
 	   (for-syntax Scheme+/operators)
 	   ;;(for-syntax Scheme+/infix)
@@ -90,7 +90,7 @@
       ;; (define x  - 4)
       ;; x
       ;; -4
-      (($nfx$ op1 e1) ; note : with 2 arg !*-prec-generic-infix-parser could not work , so we use recall-infix-parser
+      (($nfx$ op1 e1) ; deprecated note : with 2 arg !*-prec-generic-infix-parser could not work , so we use recall-infix-parser
 
        (with-syntax
 
@@ -108,7 +108,8 @@
 	      ;;) ;  end car
 
 	      ;;(car ;  probably because the result will be encapsuled in a list !
-	       (!*prec-generic-infix-parser (syntax->list #'(op1 e1))
+	     (!*prec-generic-infix-parser (list #'op1 #'e1)
+					;(syntax->list #'(op1 e1))
 					    (lambda (op a b) (list op a b)))
 	       ;) ; close car
 
@@ -150,25 +151,12 @@
 		 ;; 	  ;;(syntax->list #'(e1 op1 e2 op2 e3 op ...))))
 		 ;; 	  (syntax->list #'(e1 op1 e2 op ...))))
 
-		 (let ((expr ;(car ;  probably because the result will be encapsuled in a list !
-			      ;;(!*prec-generic-infix-parser (syntax->list #'(e1 op1 e2 op2 e3 op ...)) ; apply operator precedence rules
-			      (!*prec-generic-infix-parser (syntax->list #'(e1 op1 e2 op ...))
-							   (lambda (op a b) (list op a b)))
-			      ;) ; closing car
-			     ))
-
-		   ;; TODO pass back in n-arity also arithmetic operators (+ , * , ...) note: fail with n-arity
-		   (if ;;(not (isEXPONENTIAL? expr))
-		    (or (isDEFINE? expr)
-		       	(isASSIGNMENT? expr))
-		    ;;  make n-arity for <- and <+ only (because could be false with ** , but not implemented in n-arity for now)
-		    ;; (begin
-		    ;; 	 (display "$nfx$ : calling n-arity on expr :") (display expr) (newline) 
-		    (n-arity ;; this avoids : '{x <- y <- z <- t <- u <- 3 * 4 + 1}
-		     ;; SRFI-105.scm : !0 result = (<- (<- (<- (<- (<- x y) z) t) u) (+ (* 3 4) 1)) ;; fail set! ...
-		     ;; transform in : '(<- x y z t u (+ (* 3 4) 1))
-		     expr) ;) ; end begin
-		    expr)); ) ; end begin
+		 
+	       (!*prec-generic-infix-parser  (syntax->list #'(e1 op1 e2 op ...))
+					     (lambda (op a b) (list op a b)))
+			    
+
+	       ;; ) ; end begin
 	       ))
 
 	   ;;(display "$nfx$ : parsed-args=") (display #'parsed-args) (newline)