Changeset 8390 in project


Ignore:
Timestamp:
02/12/08 00:51:24 (12 years ago)
Author:
Kon Lovett
Message:

Removed regex-extras. More ugliness for using the platfrom PCRE header files in regex.

Location:
chicken/trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/buildsvnrevision

    r8380 r8390  
    1 8379
     18384
  • chicken/trunk/defaults.make

    r8361 r8390  
    254254CHICKEN_UNSAFE_OPTIONS = -unsafe -no-lambda-info
    255255
     256ifneq ($(USE_HOST_PCRE),)
     257CHICKEN_PCRE_LIBRARY_OPTIONS =
     258else
     259CHICKEN_PCRE_LIBRARY_OPTIONS = -include-path pcre
     260endif
     261
    256262# targets
    257263
  • chicken/trunk/distribution/manifest

    r8361 r8390  
    6565regex.c
    6666regex.exports
    67 regex-extras.c
    68 regex-extras.exports
    6967posixunix.c
    7068posix.exports
     
    180178optimizer.scm
    181179regex.scm
    182 regex-extras.scm
    183180posixunix.scm
    184181posixwin.scm
  • chicken/trunk/regex.scm

    r8361 r8390  
    3535  (generic) ; PCRE options use lotsa bits
    3636  (disable-warning var)
    37   (export
    38     ##sys#regex-chardef-table?
    39     regexp? regexp regexp*
    40     regexp-optimize
    41     regex-chardef-table?
    42     make-anchored-pattern
    43     string-match string-match-positions string-search string-search-positions
    44     string-split-fields string-substitute string-substitute*
    45     glob? glob->regexp
    46     grep
    47     regexp-escape)
    4837  (bound-to-procedure
    4938    ;; Forward reference
     
    5948    ##sys#error ##sys#signal-hook
    6049    ##sys#substring ##sys#fragments->string ##sys#make-c-string ##sys#string-append
    61     ##sys#write-char-0) )
     50    ##sys#write-char-0 )
     51  (export
     52    ##sys#regex-chardef-table?
     53    regexp? regexp regexp*
     54    regexp-optimize
     55    regex-chardef-table?
     56    make-anchored-pattern
     57    string-match string-match-positions string-search string-search-positions
     58    string-split-fields string-substitute string-substitute*
     59    glob? glob->regexp
     60    grep
     61    regexp-escape ) )
    6262
    6363(cond-expand
     
    9999;;;
    100100
    101 ;FIXME should have a common handler in "runtime.c"
    102 (foreign-declare #<<EOF
    103 static void
    104 out_of_memory_failure(const char *modnam, const char *prcnam, const char *typnam)
    105 {
    106   fprintf(stderr, "%s@%s: out of memory - cannot allocate %s\\n", modnam, prcnam, typnam);
    107   exit(EXIT_FAILURE);
    108 }
    109 EOF
    110 )
    111 
    112 (foreign-declare "#include \"pcre/pcre.h\"")
     101#>#include "pcre.h"<#
    113102
    114103
     
    221210;;; PCRE errors:
    222211
    223 (foreign-declare #<<EOF
     212#>
    224213static const char *C_regex_error;
    225214static int C_regex_error_offset;
    226 EOF
    227 )
     215<#
    228216
    229217(define-foreign-variable C_regex_error c-string)
     
    301289;; Match positions vector (PCRE ovector)
    302290
    303 (foreign-declare #<<EOF
     291#>
    304292#define OVECTOR_LENGTH_MULTIPLE 3
    305293#define STATIC_OVECTOR_LEN 256
    306294static int C_regex_ovector[OVECTOR_LENGTH_MULTIPLE * STATIC_OVECTOR_LEN];
    307 EOF
    308 )
     295<#
    309296
    310297;;
  • chicken/trunk/rules.make

    r8361 r8390  
    3030LIBCHICKEN_OBJECTS_1 = \
    3131       library eval extras lolevel utils tcp srfi-1 srfi-4 srfi-13 \
    32        srfi-14 srfi-18 $(POSIXFILE) regex regex-extras scheduler \
     32       srfi-14 srfi-18 $(POSIXFILE) regex scheduler \
    3333       profiler stub match runtime
    3434LIBCHICKEN_SHARED_OBJECTS = $(LIBCHICKEN_OBJECTS_1:=$(O))
     
    4444LIBCHICKENGUI_OBJECTS_1 = \
    4545       library eval extras lolevel utils tcp srfi-1 srfi-4 srfi-13 \
    46        srfi-14 srfi-18 $(POSIXFILE) regex regex-extras scheduler \
     46       srfi-14 srfi-18 $(POSIXFILE) regex scheduler \
    4747       profiler stub match gui-runtime
    4848LIBCHICKENGUI_SHARED_OBJECTS = $(LIBCHICKENGUI_OBJECTS_1:=$(O))
     
    123123          $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    124124regex$(O): regex.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    125         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
    126           $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
    127           $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    128 regex-extras$(O): regex-extras.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    129         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
     125        $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(PCRE_INCLUDES) \
    130126          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
    131127          $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
     
    196192          $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    197193uregex$(O): uregex.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    198         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
     194        $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(PCRE_INCLUDES) \
    199195          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
    200196          $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    201197usrfi-1$(O): usrfi-1.c chicken.h $(CHICKEN_CONFIG_H)
    202         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
     198        $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(PCRE_INCLUDES) \
    203199          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
    204200          $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
     
    270266          $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    271267regex-static$(O): regex.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    272         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
    273           $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
    274           $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    275 regex-extras-static$(O): regex-extras.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    276         $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
     268        $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(PCRE_INCLUDES) \
    277269          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
    278270          $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
     
    344336uregex-static$(O): uregex.c chicken.h $(CHICKEN_CONFIG_H) pcre/pcre.h
    345337        $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
    346           $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
     338          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(PCRE_INCLUDES) \
    347339          $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $(C_COMPILER_PCRE_OPTIONS) $< $(C_COMPILER_OUTPUT_OPTION) $@
    348340usrfi-1-static$(O): usrfi-1.c chicken.h $(CHICKEN_CONFIG_H)
     
    870862        $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
    871863regex.c: regex.scm
    872         $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
    873 regex-extras.c: regex-extras.scm
    874         $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
     864        $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) $(CHICKEN_PCRE_LIBRARY_OPTIONS) -output-file $@
    875865scheduler.c: scheduler.scm
    876866        $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) -output-file $@
     
    909899        $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) $(CHICKEN_UNSAFE_OPTIONS) -output-file $@
    910900uregex.c: regex.scm
    911         $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) $(CHICKEN_UNSAFE_OPTIONS) -output-file $@
    912 uregex-extras.c: regex-extras.scm
    913         $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) $(CHICKEN_UNSAFE_OPTIONS) -output-file $@
     901        $(CHICKEN) $< $(CHICKEN_LIBRARY_OPTIONS) $(CHICKEN_PCRE_LIBRARY_OPTIONS) $(CHICKEN_UNSAFE_OPTIONS) -output-file $@
    914902
    915903chicken.c: chicken.scm chicken-more-macros.scm chicken-ffi-macros.scm private-namespace.scm
     
    945933distfiles: library.c eval.c extras.c lolevel.c utils.c \
    946934        tcp.c srfi-1.c srfi-4.c srfi-13.c srfi-14.c srfi-18.c \
    947         posixunix.c posixwin.c regex.c regex-extras.c scheduler.c profiler.c stub.c match.c \
     935        posixunix.c posixwin.c regex.c scheduler.c profiler.c stub.c match.c \
    948936        ulibrary.c ueval.c uextras.c ulolevel.c \
    949937        uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
     
    980968        -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) library.c eval.c extras.c lolevel.c utils.c \
    981969          tcp.c srfi-1.c srfi-4.c srfi-13.c srfi-14.c srfi-18.c \
    982           posixunix.c posixwin.c regex.c regex-extras.c scheduler.c profiler.c stub.c match.c \
     970          posixunix.c posixwin.c regex.c scheduler.c profiler.c stub.c match.c \
    983971          ulibrary.c ueval.c uextras.c ulolevel.c \
    984972          uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
Note: See TracChangeset for help on using the changeset viewer.