diff -Nru cl-ppcre-2.0.1/api.lisp cl-ppcre-2.0.3/api.lisp
--- cl-ppcre-2.0.1/api.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/api.lisp	2009-09-17 19:17:30.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/api.lisp,v 1.84 2008/07/06 18:12:04 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/api.lisp,v 1.85 2009/09/17 19:17:30 edi Exp $
 
 ;;; The external API for creating and using scanners.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/CHANGELOG cl-ppcre-2.0.3/CHANGELOG
--- cl-ppcre-2.0.1/CHANGELOG	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/CHANGELOG	2009-10-28 07:36:14.000000000 +0000
@@ -1,3 +1,12 @@
+Version 2.0.3
+2009-10-28
+Use LW:SIMPLE-TEXT-STRING throughout for LispWorks
+
+Version 2.0.2
+2009-09-17
+Fixed typo in chartest.lisp (caught by Peter Seibel)
+Appease CCL (thanks to Hans Hübner)
+
 Version 2.0.1
 2008-09-02
 Fixed faulty declaration (caught by Brent Fulgham)
diff -Nru cl-ppcre-2.0.1/charmap.lisp cl-ppcre-2.0.3/charmap.lisp
--- cl-ppcre-2.0.1/charmap.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/charmap.lisp	2009-09-17 19:17:30.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/charmap.lisp,v 1.18 2008/07/22 23:54:59 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/charmap.lisp,v 1.19 2009/09/17 19:17:30 edi Exp $
 
 ;;; An optimized representation of sets of characters.
 
-;;; Copyright (c) 2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2008-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/charset.lisp cl-ppcre-2.0.3/charset.lisp
--- cl-ppcre-2.0.1/charset.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/charset.lisp	2009-09-17 19:17:30.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/charset.lisp,v 1.9 2008/07/23 00:47:58 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/charset.lisp,v 1.10 2009/09/17 19:17:30 edi Exp $
 
 ;;; A specialized set implementation for characters by Nikodemus Siivola.
 
 ;;; Copyright (c) 2008, Nikodemus Siivola. All rights reserved.
-;;; Copyright (c) 2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2008-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/chartest.lisp cl-ppcre-2.0.3/chartest.lisp
--- cl-ppcre-2.0.1/chartest.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/chartest.lisp	2009-09-17 19:17:30.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/chartest.lisp,v 1.3 2008/07/23 00:47:58 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/chartest.lisp,v 1.5 2009/09/17 19:17:30 edi Exp $
 
-;;; Copyright (c) 2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2008-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -88,7 +88,7 @@
                   (not (in-charset-p char charset)))))))
     ((:hash-table :hash-table*)
      (let ((hash-table (create-hash-table-from-test-function test-function start end)))
-       (cond ((or (eq kind :charset)
+       (cond ((or (eq kind :hash-table)
                   (<= (hash-table-count hash-table) (ceiling (- end start) 2)))
               (lambda (char)
                 (gethash char hash-table)))
diff -Nru cl-ppcre-2.0.1/closures.lisp cl-ppcre-2.0.3/closures.lisp
--- cl-ppcre-2.0.1/closures.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/closures.lisp	2009-09-17 19:17:30.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/closures.lisp,v 1.44 2008/07/22 22:38:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/closures.lisp,v 1.45 2009/09/17 19:17:30 edi Exp $
 
 ;;; Here we create the closures which together build the final
 ;;; scanner.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/cl-ppcre.asd cl-ppcre-2.0.3/cl-ppcre.asd
--- cl-ppcre-2.0.1/cl-ppcre.asd	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/cl-ppcre.asd	2009-10-28 07:36:15.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre.asd,v 1.46 2008/09/02 08:45:30 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre.asd,v 1.49 2009/10/28 07:36:15 edi Exp $
 
 ;;; This ASDF system definition was kindly provided by Marco Baringer.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz.  All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz.  All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
 (in-package :cl-ppcre-asd)
 
 (defsystem :cl-ppcre
-  :version "2.0.1"
+  :version "2.0.3"
   :serial t
   :components ((:file "packages")
                (:file "specials")
diff -Nru cl-ppcre-2.0.1/cl-ppcre-unicode/packages.lisp cl-ppcre-2.0.3/cl-ppcre-unicode/packages.lisp
--- cl-ppcre-2.0.1/cl-ppcre-unicode/packages.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/cl-ppcre-unicode/packages.lisp	2009-09-17 19:17:34.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre-unicode/packages.lisp,v 1.2 2008/07/22 13:58:13 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre-unicode/packages.lisp,v 1.3 2009/09/17 19:17:34 edi Exp $
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/cl-ppcre-unicode.asd cl-ppcre-2.0.3/cl-ppcre-unicode.asd
--- cl-ppcre-2.0.1/cl-ppcre-unicode.asd	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/cl-ppcre-unicode.asd	2009-09-17 19:17:30.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre-unicode.asd,v 1.14 2008/07/22 14:19:44 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/cl-ppcre-unicode.asd,v 1.15 2009/09/17 19:17:30 edi Exp $
 
 ;;; This ASDF system definition was kindly provided by Marco Baringer.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz.  All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz.  All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/convert.lisp cl-ppcre-2.0.3/convert.lisp
--- cl-ppcre-2.0.1/convert.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/convert.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,11 +1,11 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/convert.lisp,v 1.55 2008/09/02 08:45:30 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/convert.lisp,v 1.57 2009/09/17 19:17:31 edi Exp $
 
 ;;; Here the parse tree is converted into its internal representation
 ;;; using REGEX objects.  At the same time some optimizations are
 ;;; already applied.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -325,7 +325,7 @@
   (:documentation "Helper function for CONVERT-AUX which converts
 parse trees which are conses and dispatches on TOKEN which is the
 first element of the parse tree.")
-  (:method (token parse-tree &key)
+  (:method ((token t) parse-tree &key)
    (signal-syntax-error "Unknown token ~A in parse-tree." token)))
 
 (defmethod convert-compound-parse-tree ((token (eql :sequence)) parse-tree &key)
diff -Nru cl-ppcre-2.0.1/debian/changelog cl-ppcre-2.0.3/debian/changelog
--- cl-ppcre-2.0.1/debian/changelog	2012-02-07 13:03:04.000000000 +0000
+++ cl-ppcre-2.0.3/debian/changelog	2012-02-01 16:55:16.000000000 +0000
@@ -1,3 +1,15 @@
+cl-ppcre (2.0.3-1) unstable; urgency=low
+
+  * Team upload for new upstream release.
+  * debian/control:
+    - Bump std-ver 3.8.2 -> 3.9.2, no change required.
+    - Remove very long line in long description.
+    - Build-Depends on debhelper >= 8.
+  * debian/compat: update 7 -> 8.
+  * debian/source/format: 3.0 (quilt)
+
+ -- Aron Xu <aron@debian.org>  Tue, 31 Jan 2012 00:46:05 +0800
+
 cl-ppcre (2.0.1-2) unstable; urgency=low
 
   * Added debian/README.building
diff -Nru cl-ppcre-2.0.1/debian/compat cl-ppcre-2.0.3/debian/compat
--- cl-ppcre-2.0.1/debian/compat	2012-02-07 13:03:04.000000000 +0000
+++ cl-ppcre-2.0.3/debian/compat	2012-02-01 16:49:18.000000000 +0000
@@ -1 +1 @@
-7
+8
diff -Nru cl-ppcre-2.0.1/debian/control cl-ppcre-2.0.3/debian/control
--- cl-ppcre-2.0.1/debian/control	2012-02-07 13:03:04.000000000 +0000
+++ cl-ppcre-2.0.3/debian/control	2012-02-01 16:50:17.000000000 +0000
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
 Uploaders: Peter Van Eynde <pvaneynd@debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: dh-lisp
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: http://weitz.de/cl-ppcre/
 Vcs-Git: http://git.debian.org/git/pkg-common-lisp/cl-ppcre.git
 
@@ -14,7 +14,7 @@
 Depends: ${misc:Depends}
 Description: Portable Regular Express Library for Common Lisp 
  CL-PPCRE is a portable regular expression library for Common Lisp
- which has the following features:                                                        
+ which has the following features:
  .
   * It is compatible with Perl.
   * It is fast.
diff -Nru cl-ppcre-2.0.1/debian/source/format cl-ppcre-2.0.3/debian/source/format
--- cl-ppcre-2.0.1/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ cl-ppcre-2.0.3/debian/source/format	2012-02-07 13:03:04.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru cl-ppcre-2.0.1/doc/index.html cl-ppcre-2.0.3/doc/index.html
--- cl-ppcre-2.0.1/doc/index.html	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/doc/index.html	2009-10-28 07:36:31.000000000 +0000
@@ -151,7 +151,7 @@
 
 CL-PPCRE together with this documentation can be downloaded from <a
 href="http://weitz.de/files/cl-ppcre.tar.gz">http://weitz.de/files/cl-ppcre.tar.gz</a>. The
-current version is 2.0.1.
+current version is 2.0.3.
 <p>
 CL-PPCRE comes with a system definition
 for <a href="http://www.cliki.net/asdf">ASDF</a> and you compile and
@@ -2208,7 +2208,7 @@
 OpenMCL.
 
 <p>
-$Header: /usr/local/cvsrep/cl-ppcre/doc/index.html,v 1.198 2008/09/02 08:45:32 edi Exp $
+$Header: /usr/local/cvsrep/cl-ppcre/doc/index.html,v 1.200 2009/10/28 07:36:31 edi Exp $
 <p><a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a>
 
 </body>
diff -Nru cl-ppcre-2.0.1/errors.lisp cl-ppcre-2.0.3/errors.lisp
--- cl-ppcre-2.0.1/errors.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/errors.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/errors.lisp,v 1.21 2008/07/06 18:12:04 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/errors.lisp,v 1.22 2009/09/17 19:17:31 edi Exp $
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/lexer.lisp cl-ppcre-2.0.3/lexer.lisp
--- cl-ppcre-2.0.1/lexer.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/lexer.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/lexer.lisp,v 1.34 2008/07/06 22:36:30 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/lexer.lisp,v 1.35 2009/09/17 19:17:31 edi Exp $
 
 ;;; The lexer's responsibility is to convert the regex string into a
 ;;; sequence of tokens which are in turn consumed by the parser.
@@ -9,7 +9,7 @@
 ;;; has opened so far.  (The latter is necessary for interpreting
 ;;; strings like "\\10" correctly.)
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/optimize.lisp cl-ppcre-2.0.3/optimize.lisp
--- cl-ppcre-2.0.1/optimize.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/optimize.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/optimize.lisp,v 1.35 2008/07/06 18:12:04 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/optimize.lisp,v 1.36 2009/09/17 19:17:31 edi Exp $
 
 ;;; This file contains optimizations which can be applied to converted
 ;;; parse trees.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/packages.lisp cl-ppcre-2.0.3/packages.lisp
--- cl-ppcre-2.0.1/packages.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/packages.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/packages.lisp,v 1.38 2008/07/22 23:54:59 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/packages.lisp,v 1.39 2009/09/17 19:17:31 edi Exp $
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/parser.lisp cl-ppcre-2.0.3/parser.lisp
--- cl-ppcre-2.0.1/parser.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/parser.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/parser.lisp,v 1.30 2008/07/06 18:12:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/parser.lisp,v 1.31 2009/09/17 19:17:31 edi Exp $
 
 ;;; The parser will - with the help of the lexer - parse a regex
 ;;; string and convert it into a "parse tree" (see docs for details
@@ -7,7 +7,7 @@
 ;;; return illegal parse trees.  It is assumed that the conversion
 ;;; process later on will track them down.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/regex-class.lisp cl-ppcre-2.0.3/regex-class.lisp
--- cl-ppcre-2.0.1/regex-class.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/regex-class.lisp	2009-10-28 07:36:15.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/regex-class.lisp,v 1.42 2008/07/22 22:38:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/regex-class.lisp,v 1.44 2009/10/28 07:36:15 edi Exp $
 
 ;;; This file defines the REGEX class.  REGEX objects are used to
 ;;; represent the (transformed) parse trees internally
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -248,7 +248,12 @@
   (declare (ignore init-args))
   "Automatically computes the length of a STR after initialization."
   (let ((str-slot (slot-value str 'str)))
-    (unless (typep str-slot 'simple-string)
-      (setf (slot-value str 'str) (coerce str-slot 'simple-string))))
+    (unless (typep str-slot
+                   #-:lispworks 'simple-string
+                   #+:lispworks 'lw:simple-text-string)
+      (setf (slot-value str 'str)
+            (coerce str-slot
+                   #-:lispworks 'simple-string
+                   #+:lispworks 'lw:simple-text-string))))
   (setf (len str) (length (str str))))
 
diff -Nru cl-ppcre-2.0.1/regex-class-util.lisp cl-ppcre-2.0.3/regex-class-util.lisp
--- cl-ppcre-2.0.1/regex-class-util.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/regex-class-util.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/regex-class-util.lisp,v 1.8 2008/07/22 22:38:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/regex-class-util.lisp,v 1.9 2009/09/17 19:17:31 edi Exp $
 
 ;;; This file contains some utility methods for REGEX objects.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/repetition-closures.lisp cl-ppcre-2.0.3/repetition-closures.lisp
--- cl-ppcre-2.0.1/repetition-closures.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/repetition-closures.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,5 +1,5 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/repetition-closures.lisp,v 1.33 2008/07/06 18:12:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/repetition-closures.lisp,v 1.34 2009/09/17 19:17:31 edi Exp $
 
 ;;; This is actually a part of closures.lisp which we put into a
 ;;; separate file because it is rather complex. We only deal with
@@ -7,7 +7,7 @@
 ;;; rather crazy micro-optimizations which were introduced to be as
 ;;; competitive with Perl as possible in tight loops.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/scanner.lisp cl-ppcre-2.0.3/scanner.lisp
--- cl-ppcre-2.0.1/scanner.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/scanner.lisp	2009-09-17 19:17:31.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/scanner.lisp,v 1.35 2008/07/23 22:25:15 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/scanner.lisp,v 1.36 2009/09/17 19:17:31 edi Exp $
 
 ;;; Here the scanner for the actual regex as well as utility scanners
 ;;; for the constant start and end strings are created.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/specials.lisp cl-ppcre-2.0.3/specials.lisp
--- cl-ppcre-2.0.1/specials.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/specials.lisp	2009-10-28 07:36:15.000000000 +0000
@@ -1,9 +1,9 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/specials.lisp,v 1.41 2008/07/23 22:25:15 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/specials.lisp,v 1.43 2009/10/28 07:36:15 edi Exp $
 
 ;;; globally declared special variables
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -65,6 +65,9 @@
 (defvar *string* ""
   "The string which is currently scanned by SCAN.
 Will always be coerced to a SIMPLE-STRING.")
+#+:lispworks
+(declaim (lw:simple-text-string *string*))
+#-:lispworks
 (declaim (simple-string *string*))
 
 (defvar *start-pos* 0
diff -Nru cl-ppcre-2.0.1/test/packages.lisp cl-ppcre-2.0.3/test/packages.lisp
--- cl-ppcre-2.0.1/test/packages.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/test/packages.lisp	2009-09-17 19:17:36.000000000 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/test/packages.lisp,v 1.3 2008/07/22 12:58:52 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/test/packages.lisp,v 1.4 2009/09/17 19:17:36 edi Exp $
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/test/perl-tests.lisp cl-ppcre-2.0.3/test/perl-tests.lisp
--- cl-ppcre-2.0.1/test/perl-tests.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/test/perl-tests.lisp	2009-09-17 19:17:36.000000000 +0000
@@ -1,12 +1,12 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE-TEST; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/test/perl-tests.lisp,v 1.7 2008/07/22 23:02:04 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/test/perl-tests.lisp,v 1.8 2009/09/17 19:17:36 edi Exp $
 
 ;;; The tests in this file test CL-PPCRE against testdata generated by
 ;;; the Perl program `perltest.pl' from the input file `testinput' in
 ;;; order to check compatibility with Perl and correctness of the
 ;;; regex engine.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/test/tests.lisp cl-ppcre-2.0.3/test/tests.lisp
--- cl-ppcre-2.0.1/test/tests.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/test/tests.lisp	2009-09-17 19:17:36.000000000 +0000
@@ -1,12 +1,12 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE-TEST; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/test/tests.lisp,v 1.12 2008/07/23 00:48:00 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/test/tests.lisp,v 1.13 2009/09/17 19:17:36 edi Exp $
 
 ;;; The tests in this file test CL-PPCRE against testdata generated by
 ;;; the Perl program `perltest.pl' from the input file `testinput' in
 ;;; order to check compatibility with Perl and correctness of the
 ;;; regex engine.
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
diff -Nru cl-ppcre-2.0.1/util.lisp cl-ppcre-2.0.3/util.lisp
--- cl-ppcre-2.0.1/util.lisp	2009-04-29 04:49:37.000000000 +0000
+++ cl-ppcre-2.0.3/util.lisp	2009-10-28 07:36:15.000000000 +0000
@@ -1,10 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-PPCRE; Base: 10 -*-
-;;; $Header: /usr/local/cvsrep/cl-ppcre/util.lisp,v 1.46 2008/07/06 18:12:05 edi Exp $
+;;; $Header: /usr/local/cvsrep/cl-ppcre/util.lisp,v 1.48 2009/10/28 07:36:15 edi Exp $
 
 ;;; Utility functions and constants dealing with the character sets we
 ;;; use to encode character classes
 
-;;; Copyright (c) 2002-2008, Dr. Edmund Weitz. All rights reserved.
+;;; Copyright (c) 2002-2009, Dr. Edmund Weitz. All rights reserved.
 
 ;;; Redistribution and use in source and binary forms, with or without
 ;;; modification, are permitted provided that the following conditions
@@ -137,10 +137,15 @@
   "Coerces STRING to a simple STRING unless it already is one."
   (with-unique-names (=string=)
     `(let ((,=string= ,string))
-      (cond ((simple-string-p ,=string=)
+      (cond (#+:lispworks
+             (lw:simple-text-string-p ,=string=)
+             #-:lispworks
+             (simple-string-p ,=string=)
               ,=string=)
             (t
-              (coerce ,=string= 'simple-string))))))
+             (coerce ,=string=
+                     #+:lispworks 'lw:simple-text-string
+                     #-:lispworks 'simple-string))))))
 
 (declaim (inline nsubseq))
 (defun nsubseq (sequence start &optional (end (length sequence)))
@@ -171,7 +176,9 @@
     (dolist (string string-list)
       #-:genera (declare (string string))
       (incf total-size (length string)))
-    (let ((result-string (make-sequence 'simple-string total-size))
+    (let ((result-string (make-sequence #-:lispworks 'simple-string
+                                        #+:lispworks 'lw:simple-text-string
+                                        total-size))
           (curr-pos 0))
       (declare (fixnum curr-pos))
       (dolist (string string-list)