From b06499605c45d287522d4bceba104f320e0759a8 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Fri, 20 Mar 2009 19:43:06 -0500
Subject: [PATCH 1/2] Merge quoting vocab into mime.multipart
---
basis/mime/multipart/multipart.factor | 12 ++++++++++
basis/quoting/authors.txt | 1 -
basis/quoting/quoting-docs.factor | 32 ---------------------------
basis/quoting/quoting-tests.factor | 10 ---------
basis/quoting/quoting.factor | 16 --------------
5 files changed, 12 insertions(+), 59 deletions(-)
delete mode 100644 basis/quoting/authors.txt
delete mode 100644 basis/quoting/quoting-docs.factor
delete mode 100644 basis/quoting/quoting-tests.factor
delete mode 100644 basis/quoting/quoting.factor
diff --git a/basis/mime/multipart/multipart.factor b/basis/mime/multipart/multipart.factor
index 0edfb05a30..7f9c979f40 100755
--- a/basis/mime/multipart/multipart.factor
+++ b/basis/mime/multipart/multipart.factor
@@ -76,6 +76,18 @@ ERROR: end-of-stream multipart ;
: empty-name? ( string -- ? )
{ "''" "\"\"" "" f } member? ;
+: quote? ( ch -- ? ) "'\"" member? ;
+
+: quoted? ( str -- ? )
+ {
+ [ length 1 > ]
+ [ first quote? ]
+ [ [ first ] [ peek ] bi = ]
+ } 1&& ;
+
+: unquote ( str -- newstr )
+ dup quoted? [ but-last-slice rest-slice >string ] when ;
+
: save-uploaded-file ( multipart -- )
dup filename>> empty-name? [
drop
diff --git a/basis/quoting/authors.txt b/basis/quoting/authors.txt
deleted file mode 100644
index 7c1b2f2279..0000000000
--- a/basis/quoting/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Doug Coleman
diff --git a/basis/quoting/quoting-docs.factor b/basis/quoting/quoting-docs.factor
deleted file mode 100644
index 5fb68db719..0000000000
--- a/basis/quoting/quoting-docs.factor
+++ /dev/null
@@ -1,32 +0,0 @@
-! Copyright (C) 2009 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: help.markup help.syntax strings ;
-IN: quoting
-
-HELP: quote?
-{ $values
- { "ch" "a character" }
- { "?" "a boolean" }
-}
-{ $description "Returns true if the character is a single or double quote." } ;
-
-HELP: quoted?
-{ $values
- { "str" string }
- { "?" "a boolean" }
-}
-{ $description "Returns true if a string is surrounded by matching single or double quotes as the first and last characters." } ;
-
-HELP: unquote
-{ $values
- { "str" string }
- { "newstr" string }
-}
-{ $description "Removes a pair of matching single or double quotes from a string." } ;
-
-ARTICLE: "quoting" "Quotation marks"
-"The " { $vocab-link "quoting" } " vocabulary is for removing quotes from a string." $nl
-"Removing quotes:"
-{ $subsection unquote } ;
-
-ABOUT: "quoting"
diff --git a/basis/quoting/quoting-tests.factor b/basis/quoting/quoting-tests.factor
deleted file mode 100644
index 0cc28a1354..0000000000
--- a/basis/quoting/quoting-tests.factor
+++ /dev/null
@@ -1,10 +0,0 @@
-! Copyright (C) 2009 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test quoting ;
-IN: quoting.tests
-
-
-[ "abc" ] [ "'abc'" unquote ] unit-test
-[ "abc" ] [ "\"abc\"" unquote ] unit-test
-[ "'abc" ] [ "'abc" unquote ] unit-test
-[ "abc'" ] [ "abc'" unquote ] unit-test
diff --git a/basis/quoting/quoting.factor b/basis/quoting/quoting.factor
deleted file mode 100644
index 9e25037cd9..0000000000
--- a/basis/quoting/quoting.factor
+++ /dev/null
@@ -1,16 +0,0 @@
-! Copyright (C) 2009 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.short-circuit kernel math sequences strings ;
-IN: quoting
-
-: quote? ( ch -- ? ) "'\"" member? ;
-
-: quoted? ( str -- ? )
- {
- [ length 1 > ]
- [ first quote? ]
- [ [ first ] [ peek ] bi = ]
- } 1&& ;
-
-: unquote ( str -- newstr )
- dup quoted? [ but-last-slice rest-slice >string ] when ;
From f73f4e6293f82915d110a84e7086f840951d7f37 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 21 Mar 2009 00:47:33 -0500
Subject: [PATCH 2/2] Fix load error in mime.multipart
---
basis/mime/multipart/multipart.factor | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/basis/mime/multipart/multipart.factor b/basis/mime/multipart/multipart.factor
index 7f9c979f40..37d5e13129 100755
--- a/basis/mime/multipart/multipart.factor
+++ b/basis/mime/multipart/multipart.factor
@@ -3,8 +3,7 @@
USING: multiline kernel sequences io splitting fry namespaces
http.parsers hashtables assocs combinators ascii io.files.unique
accessors io.encodings.binary io.files byte-arrays math
-io.streams.string combinators.short-circuit strings math.order
-quoting ;
+io.streams.string combinators.short-circuit strings math.order ;
IN: mime.multipart
CONSTANT: buffer-size 65536