Changeset 35743 in project

Timestamp:

07/05/18 03:23:22 (8 months ago)

Author:

kon

Message:

use "atomized" symbol-utils, add ,srfi stuff (no new C4 eggs), should add feature stuff

Location:

release/4/apropos/trunk

Files:

• apropos-srfi-csi.scm (added)
• apropos-srfi-db.scm (added)
• apropos-srfi.scm (added)
• apropos.meta (modified) (1 diff)
• apropos.scm (modified) (6 diffs)
• apropos.setup (modified) (1 diff)
• tests/apropos-srfi-test.scm (added)
• tests/run.scm (modified) (1 diff)

release/4/apropos/trunk/apropos.meta

@@ -9 +9 @@
  (depends
         (setup-helper "1.5.2")
+        (check-errors "1.9.0")
         (miscmacros "2.91")
-        ;(moremacros "1.4.1")
         (string-utils "1.1.0")
-        (symbol-utils "1.0.0")
-        (check-errors "1.9.0"))
+        (symbol-utils "1.1.0"))
  (test-depends test)
  (files
   "apropos.meta" "apropos.setup"
   "apropos.scm"
-  "tests/run.scm" "tests/apropos-test.scm") )
+  "apropos-srfi.scm" "apropos-srfi-csi.scm" "apropos-srfi-db.scm"
+  "tests/run.scm" "tests/apropos-test.scm"
+  "tests/apropos-srfi-test.scm") )

release/4/apropos/trunk/apropos.scm

@@ -1 @@
-;;;; apropos.scm -*- Hen -*-
+;;;; apropos.scm
+;;;; Kon Lovett, Oct '17
+;;;; Kon Lovett, Mar '09
 ;;;; From the Chicken 4 core, Version 4.0.0x5 - SVN rev. 13662
-;;;; Kon Lovett, Mar '09
-;;;; Kon Lovett, Oct '17
 
 ;; Issues
@@ -23 +23 @@
 ;; ; {{search|mode pre[fix]|suff[ix]|#t}} : {{#:search-mode #:prefix|#:suffix|#t}}
 ;; ; {{SEARCH-MODE}} : Either {{#:prefix}}, {{#:suffix}}, or {{#t}} for contains. The default is {{#t}}.
+
+(declare
+  (bound-to-procedure
+    ##sys#symbol-has-toplevel-binding?
+    ##sys#macro-environment
+    ##sys#current-environment
+    ##sys#macro?))
 
 (module apropos
@@ -38 +45 @@
 
 (import scheme chicken foreign)
-
 (import (only csi toplevel-command))  ;wtf?
-
 (use
   (only data-structures
@@ -67 +72 @@
     irregex-match-data? irregex-match-num-submatches
     irregex-replace)
+  miscmacros
   (only memoized-string
     make-string*)
-  (only symbol-utils
+  (only symbol-name-utils
     symbol->keyword
     symbol-printname=? symbol-printname<?
-    symbol-printname-length max-symbol-printname-length )
+    symbol-printname-length max-symbol-printname-length)
+  (only symbol-qualified-utils
+    qualified-symbol?)
   (only type-checks
     check-fixnum define-check+error-type)
   (only type-errors
-    define-error-type error-argument-type)
-  miscmacros)
-
-(declare
-  (bound-to-procedure
-    ##sys#symbol-has-toplevel-binding?
-    ##sys#qualified-symbol?
-    ##sys#macro-environment
-    ##sys#current-environment
-    ##sys#macro? ) )
+    define-error-type error-argument-type))
 
 ;;; Support
 
-;;
-
+;; Raw Access Renames
+
+(define system-current-environment ##sys#current-environment)
+
+(define system-macro-environment ##sys#macro-environment)
+
+(define (global-symbol-bound? sym)
+  (##sys#symbol-has-toplevel-binding? sym) )
+
+(define (global-symbol-ref sym)
+  (##sys#slot sym 0) )
+
+(define (symbol-macro-in-environment? sym macenv)
+  (and sym macenv (##sys#macro? sym macenv)) )
+
+;;
+
+;for our purposes
 (define-constant *CHICKEN-MAXIMUM-BASE* 16)
 
@@ -96 +111 @@
 
 (define (->boolean obj)
-  (and
-    obj
-    #t ) )
+  (and obj #t ) )
 
 ;; irregex extensions
@@ -118 +131 @@
       (string-append x (make-string rem pad))
       (string-append (substring x 0 (fx- n (string-length tag))) tag) ) ) )
-
-;; raw access renames
-
-(define system-current-environment ##sys#current-environment)
-
-(define system-macro-environment ##sys#macro-environment)
-
-(define (global-symbol-bound? sym)
-  (##sys#symbol-has-toplevel-binding? sym) )
-
-(define (global-symbol-ref sym)
-  (##sys#slot sym 0) )
-
-(define (symbol-macro-in-environment? sym macenv)
-  (and sym macenv (##sys#macro? sym macenv)) )
-
-(define (qualified-symbol? sym)
-  (and sym (##sys#qualified-symbol? sym)) )
 
 ;; Constants

release/4/apropos/trunk/apropos.setup

@@ -6 +6 @@
 
 (unless (version>=? (chicken-version) "4.4.0")
+  (enable-warnings #t)
   (warning "cannot use with CHICKEN earlier than version 4.4.0, install apropos:1.4.3 instead.")
   (exit 1) )
 
-(setup-shared-extension-module 'apropos (extension-version "2.7.2")
+(setup-shared-extension-module 'apropos (extension-version "2.8.0")
   #:types? #t
   #:inline? #t
-  #:compile-options '(
-    -O3 -d1
-    -no-procedure-checks))
+  #:compile-options '(-O3 -d1 -no-procedure-checks))
+
+;;; (verify-extension-name "apropos-srfi" #;"1.0.0")
+
+(setup-shared-extension-module 'apropos-srfi-db (extension-version "2.8.0")
+  #:types? #t
+  #:inline? #t
+  #:compile-options '(-O3 -d1 -no-procedure-checks))
+
+(setup-shared-extension-module 'apropos-srfi (extension-version "2.8.0")
+  #:types? #t
+  #:inline? #t
+  #:compile-options '(-O3 -d1 -no-procedure-checks))
+
+(setup-shared-extension-module 'apropos-srfi-csi (extension-version "2.8.0")
+  #:types? #t
+  #:inline? #t
+  #:compile-options '(-O3 -d1 -no-procedure-checks))

release/4/apropos/trunk/tests/run.scm

@@ -42 +42 @@
 
 (run-test)
+
+(run-test "apropos-srfi")