move the to_upper and to_lower functions to system/string.anubis location

David René
1 parent 43565b22
Showing 4 changed files with 59 additions and 76 deletions Show diff stats
anubis_dev/library/system/files.anubis
anubis_dev/library/system/string.anubis
anubis_dev/library/tools/basis.anubis
anubis_dev/library/web/multihost_http_server.anubis
@@ -193,7 +193,8 @@ public define ResultCopy
     truncated(buffer)       then
       if length(buffer) = 0 then
         copy_ok
-      else if write( target , buffer) is
+      else 
+      if write( target , buffer) is
       {
         failure     then copy_error,
         success(_)  then copy_ok
@@ -33,6 +33,19 @@
 read tools/basis.anubis
 read tools/findstring.anubis
  
+
+   
+   'crlf'  is a  string which  is required  by  the HTTP  protocol to  mark the  end of  a
+   line. Any HTTP request or HTTP answer has  two parts (the second one may be empty): the
+   header and the body. The header is  made of several lines (at least one), and separated
+   from the body by a blank line. In other words, the header is separated from the body by
+   a ''double crlf''.
+   
+public define String crlf     = implode([(Word8)13,10]).     i.e ASCII characters:   13 10  (in this order)
+public define String crlfcrlf = implode([(Word8)13,10,13,10]).   
+
+
+  
 define String 
   zero_pad_n
   ( 
@@ -44,6 +57,49 @@ define String
   else 
     number.
  
+public define Word8
+  to_lower
+    (
+      Word8 c
+    ) =
+  with n = word8_to_int32(c), 
+  if ('A' =< n & n =< 'Z')
+  then truncate_to_word8(n - 'A' + 'a')
+  else c. 
+   
+public define Word8
+  to_upper
+    (
+      Word8 c
+    ) =
+  with n = word8_to_int32(c), 
+  if ('a' =< n & n =< 'z')
+  then truncate_to_word8(n - 'a' + 'A')
+  else c. 
+
+   Putting a string to lower case. 
+   
+define String 
+  to_lower   
+    (
+      String s,
+      Int32 n, 
+      List(Word8) so_far
+    ) =
+  if nth(n,s) is 
+    {
+      failure then implode(reverse(so_far)), 
+      success(c) then
+        to_lower(s,n+1,[to_lower(c) . so_far])
+    }.
+   
+public define String
+  to_lower
+    (
+      String s
+    ) =
+  to_lower(s,0,[]). 
+  
 public define String 
   zero_pad_n
   ( 
@@ -102,7 +102,6 @@
    *** (13) Manipulating characters
       *** (13.1)  Putting a character to lower case. 
       *** (13.2) Putting a string to lower case. 
-      *** (13.3) 'crlf'
  
    *** (14) Prompting and reading from standard input. 
       *** (14.1) Reading a line from the standard input. 
@@ -117,7 +116,6 @@
       *** (16.3) System font names
  
    ---------------------------------------------------------------------------------------
-
  
    *** (1) Boolean functions
  
@@ -2175,78 +2173,6 @@ public define List(String)
    +
    get_more_files(directory_name,file_name_mask,directory_full_list(directory_name,"","","*")). 
  
-   
-   
-
-   *** (13) Manipulating characters
-   
-      *** (13.1)  Putting a character to lower case. 
-   
-public define Word8
-  to_lower
-    (
-      Word8 c
-    ) =
-  with n = word8_to_int32(c), 
-  if ('A' =< n & n =< 'Z')
-  then truncate_to_word8(n - 'A' + 'a')
-  else c. 
-   
-public define Word8
-  to_upper
-    (
-      Word8 c
-    ) =
-  with n = word8_to_int32(c), 
-  if ('a' =< n & n =< 'z')
-  then truncate_to_word8(n - 'a' + 'A')
-  else c. 
-   
-   
-      *** (13.2) Putting a string to lower case. 
-   
-define String 
-  to_lower   
-    (
-      String s,
-      Int32 n, 
-      List(Word8) so_far
-    ) =
-  if nth(n,s) is 
-    {
-      failure then implode(reverse(so_far)), 
-      success(c) then
-        to_lower(s,n+1,[to_lower(c) . so_far])
-    }.
-   
-
-public define String
-  to_lower
-    (
-      String s
-    ) =
-  to_lower(s,0,[]). 
-   
-   
-   
-   
-      *** (13.3) 'crlf'
-   
-   'crlf'  is a  string which  is required  by  the HTTP  protocol to  mark the  end of  a
-   line. Any HTTP request or HTTP answer has  two parts (the second one may be empty): the
-   header and the body. The header is  made of several lines (at least one), and separated
-   from the body by a blank line. In other words, the header is separated from the body by
-   a ''double crlf''.
-   
-public define String 
-  crlf = implode([(Word8)13,10]).     i.e ASCII characters:   13 10  (in this order)
-      
-public define String crlfcrlf = implode([(Word8)13,10,13,10]).   
-   
-   
-   
-   
-
    *** (14) Prompting and reading from standard input. 
  
       *** (14.1) Reading a line from the standard input. 
@@ -163,7 +163,7 @@
 read web/common.anubis   
 read tools/basis.anubis   
 read web/mime.anubis   
-   
+read system/string.anubis
  
  
    *** (4) Site descriptions.