Changeset 38598 in project for release

Timestamp:

04/07/20 05:52:30 (4 months ago)

Author:

Kon Lovett

Message:

hide *output-grammar*, ... behind active-grammar

Location:

release/5/slib-prec/trunk

Files:

• slib-grammar.scm (modified) (3 diffs)
• slib-prec-grammar.scm (modified) (3 diffs)
• tests/slib-prec-test.scm (modified) (2 diffs)

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

@@ -28 +28 @@
 ;;from jacal unparse.scm
 (define (print-using-grammar sexp grm)
-  (print "[" (grammar-name grm) "] " sexp)
-  #;
-  (template-print sexp (grammar-write-tab grm)))
+  ;(print "[" (grammar-name grm) "] " sexp)
+  (pretty-print sexp)
+  #; ;needs most of jacal!
+  (template-print sexp (grammar-write-tab grm)) )
 
-;#|
 ; supplies module based struct tag & other identifiers
 (define-record grammar name reader read-tab writer write-tab)
@@ -84 +84 @@
        col)
     (read-char port)))
-;|#
 
 ;;
@@ -106 +105 @@
       (grammar-reader-set! grm tmp)
       res ) ) )
-
-;from jacal toploads.scm
-(define *input-grammar* (get-grammar 'scheme))
-(define *output-grammar* (get-grammar 'scheme))
-(define *echo-grammar* (get-grammar 'null))
-(define tran:translations '())
-;(define Language #f)
-(define math:debug #f)
-(define math:phases #f)
-(define math:trace #f)
-;(define linkradicals #f)
-(define horner #f)
-(define page-height #f)
-(define page-width #f)
-;(define newextstr #f)
-;(define newlabelstr #f)
-;(define newlabelsym #f)
-;(define % #f)
-;(define *modulus* 0)
-
-;
-(define (math:error . args) (apply slib:error 'math: args))
-(define (math:warn . args) (apply slib:warn 'math: args))
-(define (math:exit b) #;(cleanup-handlers!) (slib:error "error in math system"))

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

@@ -7 +7 @@
 (;export
   ;
-  *input-grammar*
-  *output-grammar*
-  *echo-grammar*
+  active-grammar
   active-grammar-set!
   read-syntax-setup!
@@ -50 +48 @@
 
 (include "slib-compat")
+
+(define (math:error . args) (apply slib:error 'math: args))
+(define (math:warn . args) (apply slib:warn 'math: args))
+(define (math:exit b) #;(cleanup-handlers!) (slib:error "error in math system"))
+
 (include "slib-grammar")
+
+(define *input-grammar*)
+(define *output-grammar*)
+(define *echo-grammar*)
+
 (include "output-grammars")
 (include "input-grammars")
@@ -88 +96 @@
   (set! *echo-grammar* echo) )
 
+(define (active-grammar) (values *input-grammar* *output-grammar* *echo-grammar*))
+
 ;;
 

release/5/slib-prec/trunk/tests/slib-prec-test.scm

@@ -19 +19 @@
 (define ^ expt)
 
+(define (active-input-grammar) (receive (i o e) (active-grammar) i))
+
 ;;
 
@@ -29 +31 @@
 ;;
 
-(define (read-sexp/string str #!optional (grm *input-grammar*) (icol 0))
+(define (read-sexp/string str #!optional (grm (active-input-grammar)) (icol 0))
  (import (only (chicken port) with-input-from-string))
  (with-input-from-string str (lambda () (read-sexp grm icol))) )