Changeset 38718 in project for release

Timestamp:

05/30/20 21:59:29 (2 months ago)

Author:

Kon Lovett

Message:

remove unused, tighten prefix

Location:

release/5/slib-prec/trunk

Files:

• slib-prec-parse.scm (modified) (2 diffs)
• slib-standard-grammar.scm (modified) (2 diffs)

release/5/slib-prec/trunk/slib-prec-parse.scm

@@ -31 +31 @@
   prec:prefix
   prec:infix
-  prec:infixr
   prec:nary
   prec:postfix
@@ -118 +117 @@
 ;;
 
-(define (prec:infixr tk sop lbp . binds)
-  (let* (
-    (bp (and (not (null? binds)) (number? (car binds)) (car binds)))
-    (binds (if bp (cdr binds) binds))
-    (bp (or bp (max 0 (- lbp 1)))) )
-    (apply prec:infix tk sop lbp bp binds) ) )
-
-;;
-
 (define (make-grammar src #!optional (base '()))
   (let* (

release/5/slib-prec/trunk/slib-standard-grammar.scm

@@ -79 +79 @@
 
 ;;;prefix operators
-(prec:define-grammar (prec:prefix '+ #f 100))
-(prec:define-grammar (prec:prefix '- 'negate 100))
-(prec:define-grammar (prec:prefix "+/-" 'u+/- 100))
-(prec:define-grammar (prec:prefix "-/+" 'u-/+ 100))
+(prec:define-grammar (prec:prefix '+ #f 150))
+(prec:define-grammar (prec:prefix '- 'negate 150))
+(prec:define-grammar (prec:prefix "+/-" 'u+/- 150))
+(prec:define-grammar (prec:prefix "-/+" 'u-/+ 150))
+
 (prec:define-grammar (prec:prefix '(not ~) 'impl:not 70))
+
 (prec:define-grammar (prec:prefix ":" 'settemplate! 20))
 
 ;;;nary operators
 (prec:define-grammar (prec:nary '* '* 120))
+(prec:define-grammar (prec:nary '/ '/ 120))
 (prec:define-grammar (prec:nary '+ '+ 100))
 (prec:define-grammar (prec:nary '- '- 100))
 (prec:define-grammar (prec:nary "+/-" 'b+/- 100))
 (prec:define-grammar (prec:nary "-/+" 'b-/+ 100))
-(prec:define-grammar (prec:nary '/ '/ 120))
+
 (prec:define-grammar (prec:nary '(and #\&) '& 60))
 (prec:define-grammar (prec:nary 'or 'or 50))
@@ -101 +104 @@
 (prec:define-grammar (prec:infix #\. 'ncmult 110 109))
 (prec:define-grammar (prec:infix '(^ **) '^ 140 139))
-;(prec:define-grammar (prec:infixr #\. 'ncmult 110))
-;(prec:define-grammar (prec:infix '(^ **) '^ 140))
+
 (prec:define-grammar (prec:infix '^^ '^^ 210 210))
+
 (prec:define-grammar (prec:infix '(":=" ":") 'define 180 20))
+
 (prec:define-grammar (prec:infix '= '= 80 80))
 ;(prec:define-grammar (prec:infix '(~= <>) 'make-not-equal 80 80))
+
 (prec:define-grammar (prec:infix 'mod 'mod 70 70))
+
 (prec:define-grammar (prec:infix ':: 'suchthat 190 40))
 (prec:define-grammar (prec:infix "|" 'suchthat 190 40))