*** empty log message ***

* empty log message *
Alain Prouté
1 parent 7697f425
Showing 14 changed files with 177 additions and 58 deletions Show diff stats
anubis_distrib/library/compil_all.anubis
anubis_distrib/library/data_base/sqlite.anubis
anubis_distrib/library/examples/cryptography/md5.anubis
anubis_distrib/library/predefined.anubis
anubis_distrib/library/system/files.anubis
anubis_distrib/library/system/logger.anubis
anubis_distrib/library/system/string.anubis
anubis_distrib/library/tools/basis.anubis
anubis_distrib/library/web/file_manager.anubis
anubis_distrib/library/web/http_server.anubis
anubis_distrib/library/web/multihost_http_server.anubis
anubis_distrib/linux_install/bin/anbexec
anubis_distrib/linux_install/bin/anubis
anubis_distrib/linux_install/prepare_package/Makefile
@@ -32,6 +32,7 @@ read examples/try_now.anubis
 read examples/try_protect.anubis
  read examples/watt.anubis                  //does not compile, but this is normal. See the file itself. 
 read examples/cryptography/sha1.anubis
+read examples/cryptography/md5.anubis
 read examples/graphism/diaporama.anubis
 read examples/graphism/paint.anubis
 read examples/graphism/paint2.anubis
@@ -105,11 +105,12 @@ public define Int32 -&gt; Int32
 public define List(String)
   db_make_string_list
   (
-    List(String)                        so_far,
+    List(String)              so_far,
     One -> SQLite3Row cursor
   ) =
   if cursor(unique) is
   {
+    error(_)      then so_far,
     no_more_row   then so_far,
     row(explorer) then 
       with data = text(explorer)(0),
@@ -136,11 +137,12 @@ define Int32
        One -> SQLite3Row  cursor,
        Int32  so_far
      ) =
-   if cursor(unique) is 
-   {
-     no_more_row  then so_far,
-     row(_)       then count_rows_private(cursor, so_far + 1)
-   }.
+  if cursor(unique) is 
+  {
+    error(_)    then 0,  
+    no_more_row then so_far,
+    row(_)      then count_rows_private(cursor, so_far + 1)
+  }.
  
 /** Count the number of rows in the cursor. So this function call
  *  itself recursively until the cursor become empty. At each call
@@ -153,11 +155,12 @@ public define Int32
      (
        One -> SQLite3Row  cursor
      ) =
-   if cursor(unique) is 
-   {
-     no_more_row  then 0,
-     row(_)       then count_rows_private(cursor, 1)
-   }.
+  if cursor(unique) is 
+  {
+    error(_)    then 0,
+    no_more_row then 0,
+    row(_)      then count_rows_private(cursor, 1)
+  }.
  
  
   *Description*
@@ -268,6 +271,7 @@ public define Bool db_table_exists_test( SQLite3DataBase db, String table) =
     ok(table_content) then 
       if table_content(unique) is 
       {
+        error(_)    then false,
         no_more_row then print("Table "+table+" does not exist\n"); false, 
         row(row1)   then print("Table "+table+" exists\n"); true
       }
@@ -287,6 +291,7 @@ public define Bool
       ok(table_content) then 
         if table_content(unique) is 
         {
+          error(_)    then false,
           no_more_row then false, 
           row(row1)   then true
         }
@@ -61,4 +61,15 @@ global define One
       [_._] then do_it(args)
     }.
  
-   
 \ No newline at end of file
+global define One
+  md5_string
+  (
+    List(String) args
+  )=
+  if args is
+  {
+    []    then print("no string found\n"),
+    [h._] then 
+            print("MD5 hash of " + ": " +h +"\n is ["+ to_ascii(md5(h)) + "]\n")
+
+  }.
@@ -42,7 +42,8 @@
       *** (2.3) The type scheme 'Result($E,$T)', 'error' and 'ok'. 
       *** (2.4) The type schemes 'List($T)', 'NonEmptyList($T)', '[ ]' and '[ . ]'. 
       *** (2.5) The types 'Bit' and 'Int8'. 
-      *** (2.5) The types 'RGB' and 'RGBA'. 
+      *** (2.6) Bigits.    
+      *** (2.7) The types 'RGB' and 'RGBA'. 
  
    *** (3) Useful parameters and informations.
       *** (3.1) Determination of the host system. 
@@ -344,7 +345,27 @@ public type Int8:
  
  
  
-      *** (2.5) The types 'RGB' and 'RGBA'. 
+      *** (2.6) Bigits.
+   
+   We want to give an access to  the words with which the microprocessor is computing. The
+   type 'Bigit' is primitive and represents 'machine  words', i.e. arrays of 32 or 64 bits
+   (maybe more  in the future),  the kind of  thing which is used  in the register  of the
+   microprocessor for arithmetical computations.
+   
+   public type Bigit:...        (Actually a primitive type)
+   
+   The reason why this  type is called 'Bigit' is that 'Bigit'  is the contraction of 'big
+   digit'.  Indeed, microprocessors  compute  (as  far as  arithmetic  is concerned)  with
+   machine words exactly as we compute ourself (by hand) with decimal digits. 
+      
+   The  operations  which  may be  performed  with  Bigits  are  described below  in  this
+   file. Bigits are used to implement arbitrary large integers.
+   
+   
+   
+   
+   
+      *** (2.7) The types 'RGB' and 'RGBA'. 
  
 public type RGB:
    rgb(Int8 red, 
@@ -949,13 +970,47 @@ public define String          constant_string(Int32 n,
  
  
  
+      *** (4.5) Bigits. 
+   
+   Remember that  bigits are  just 'big digits'  (analogous to decimal  digits). Computing
+   with bigits  is just  like computing  with decimal digits,  except that  the numeration
+   basis is something like  2^32 or 2^64 instead of 10. Like  the decimal digits 0, 1,...,
+   9, they  are not signed. The actual  size of Bigits is  implementation dependant. Also,
+   recall that  decimal notations have an  interpretation as bigits provided  they are not
+   preceded by a minus sign.
  
  
+ public define (Bigit,Bit)     Bigit x + Bigit y    = £avm{ bigit_add }. 
  
+   This is the  addition for bigits. The result is  made of a bigit an a  bit which is the
+   carry.
+
  
+ public define (Bigit,Bigit)   Bigit x * Bigit y    = £avm{ bigit_multiply }. 
  
+   This is the multiplication  for bigits. The result is made of  two bigits. For example,
+   with decimal digits we have 7*5 = 35, which could be written:
  
-      *** (4.4) Floating point numbers (type 'Float').    
+                                            7 * 5 = (3,5)
+   
+   (i.e. with  the result given as  a pair of digits).  This primitive does  the same, but
+   with bigits.
+
+   
+ public define Maybe((Bigit,Bigit))   (Bigit,Bigit) x / Bigit y =   £avm{ bigit_divide }.
+   
+   This is the division for bigits. The result is failure if one at least of the following
+   conditions is satified:
+   
+     - y is 0 (division by zero is forbidden)
+     - assuming that x is (a,b), a is greater than or equal to y. 
+   
+   Otherwise, the result 'success((q,r))' contains the quotient and the remainder.
+      
+   
+   
+   
+      *** (4.5) Floating point numbers (type 'Float').    
  
    Many 'float'  operations return a  datum of type  'Maybe(Float)'.  This is  because the
    operation may  fail to give  an actual number.  This may be  due to many  reasons. Most
@@ -2282,13 +2337,14 @@ public define UTime            now                             = £avm{ now64 }.
  
 public type Date_and_Time:
   date_and_time(Int32 year, 
-                Int32 month,          // from 0 = January to 11 = December
-                Int32 day,            // from 1 to 31
-                Int32 hour,           // from 0 to 23
-                Int32 minute,         // from 0 to 59
-                Int32 second,         // from 0 to 59
-                Int32 week_day,       // from 0 = sunday to 6 = saturday
-                Int32 year_day).      // from 0 = January 1st, to at most 365
+                Int32 month,                 // from 0 = January to 11 = December
+                Int32 day,                   // from 1 to 31
+                Int32 hour,                  // from 0 to 23
+                Int32 minute,                // from 0 to 59
+                Int32 second,                // from 0 to 59
+                Int32 week_day,              // from 0 = sunday to 6 = saturday
+                Int32 year_day,              // from 0 = January 1st, to at most 365
+                Bool  daylight_saving_time). // if 'true' daylight saving time is applied
  
  
    Time may be convert to and fro:
@@ -4670,8 +4726,9 @@ public type SQLite3Datum:
    representing an SQLite3 error code (see http://www.sqlite.org for informations).
  
 public type SQLite3Row:
+   error(SQLite3Error), 
    no_more_row,
-   row(Int32 -> SQLite3Datum). 
+   row(Int32 -> SQLite3Datum).
  
 public type SQLite3Result:
    result(Int32                returned_rows,
@@ -4734,6 +4791,7 @@ define String
        £StructPtr(SQLite3) s
      ) =
    £avm{ sqlite3_errmsg }.
+
  
 public define Result(SQLite3Error,SQLite3DataBase)
    sqlite3_open
@@ -4742,12 +4800,10 @@ public define Result(SQLite3Error,SQLite3DataBase)
      ) =
    with handle = £sqlite3_open(filename),
           code = £sqlite3_errcode(handle),
-           msg = £sqlite3_errmsg(handle), 
      if code = 0
      then ok(£database(handle))
-     else error(sqlite3(£sqlite3_errcode(handle),£sqlite3_errmsg(handle))). 
+     else error(sqlite3(code,£sqlite3_errmsg(handle))).
  
-
  
 public type £SQLite3DatumType:
    £integer,
@@ -4841,7 +4897,12 @@ define Int32
      ) =
    £avm{ sqlite3_column_count }. 
  
-define Bool
+public type £SQLite3NextRowResult:
+   no_more_row, 
+   row, 
+   error. 
+   
+define £SQLite3NextRowResult
    £go_to_next_row
      (
        £StructPtr(SQLite3Stmt)    stmt
@@ -4851,6 +4912,7 @@ define Bool
 define One -> SQLite3Row
    £make_cursor
      (
+       £StructPtr(SQLite3)        db,
        £StructPtr(SQLite3Stmt)    stmt,
        Var(Bool)                  first
      ) =
@@ -4858,9 +4920,13 @@ define One -&gt; SQLite3Row
    (One _) |-> 
       if *first
       then (first <- false; row(£make_row(stmt,num_columns)))
-      else if £go_to_next_row(stmt) 
-           then row(£make_row(stmt,num_columns))
-           else no_more_row. 
+      else if £go_to_next_row(stmt) is
+             {
+               no_more_row  then no_more_row, 
+               row          then row(£make_row(stmt,num_columns)),
+               error        then error(sqlite3(£sqlite3_errcode(db),£sqlite3_errmsg(db))) 
+             }. 
+   
  
 define Result(Int32,£StructPtr(SQLite3Stmt))
    £prepare
@@ -4883,15 +4949,15 @@ public define Result(SQLite3Error, One -&gt; SQLite3Row)
      {
        error(i) then error(sqlite3(i,£sqlite3_errmsg(db1))), 
        ok(stmt) then 
-         if £go_to_next_row(stmt)
-         then 
-           (
-           with first = var((Bool)true), 
-           ok(£make_cursor(stmt,first))
-           )
-         else 
-           ok((One _) |-> no_more_row)
-     }.
+         if £go_to_next_row(stmt) is
+           {
+             no_more_row   then ok((One _) |-> no_more_row),
+             row           then with first = var((Bool)true), 
+                                ok(£make_cursor(db1,stmt,first)),
+             error         then error(sqlite3(£sqlite3_errcode(db1),£sqlite3_errmsg(db1)))
+           }
+     }. 
+   
  
  
  
@@ -37,7 +37,7 @@ define ResultCopy
     copy_ok
   else if read(source, read_length, 10) is
   {
-    failure then copy_error,
+    failure         then copy_error,
     success(buffer) then
     if write( target , buffer) is
     {
@@ -42,7 +42,7 @@ public define One logFileError( Logger al, String lvlStr, String msg) =
       success(st) then
         with currentTime = (UTime)now,
         if currentTime is utime(sec,micro) then
-          if convert_time(sec) is date_and_time(y, month, d, h, min, s, _, _) then 
+          if convert_time(sec) is date_and_time(y, month, d, h, min, s, _, _, _) then 
             with finalStr = "[" +integer_to_string(y) +
                       zero_pad_n(2, month+1) +
                       zero_pad_n(2, d) + "-" +
@@ -59,7 +59,7 @@ public define One logFileError( Logger al, String lvlStr, String msg) =
 public define One logConsoleError( String lvlStr, String msg) =
   with currentTime = (UTime)now,
   if currentTime is utime(sec,micro) then
-    if convert_time(sec) is date_and_time(y, month, d, h, min, s, _, _) then
+    if convert_time(sec) is date_and_time(y, month, d, h, min, s, _, _, _) then
       print( "[" +integer_to_string(y) +
                       zero_pad_n(2, month+1) +
                       zero_pad_n(2, d) + "-" +
@@ -54,7 +54,7 @@ public define String
   else 
     s.
  
-define List(Int8)
+define (List(Int8), List(Int8))
   in_word
   (
     List(Int8) so_far,
@@ -62,10 +62,10 @@ define List(Int8)
   ) =
   if current is
   {
-    []      then so_far,
+    []      then (so_far, []),
     [h . t] then
     if h = 32 then
-      so_far
+      (so_far, t)
     else
       in_word([h . so_far], t)
   }.
@@ -77,12 +77,12 @@ define Maybe(List(Int8))
   ) =
   if current is
   {
-    []     then failure,
-    [h . t]  then
+    []        then failure,
+    [h . t]   then
     if h = 32 then //we skip 32 ASCII code is space
       search_first_char(t)
     else
-      success(in_word([h], t))
+      if in_word([h], t) is (word, _) then success(word)
    }.
  
 public define Maybe(String)
@@ -109,7 +109,41 @@ public define Maybe(String)
     failure     then failure,
     success(s)  then first_word(s)
   }.
-     
+
+define Maybe(List(String))
+  list_word
+  (
+    List(Int8)    input,
+    List(String)  string_so_far
+  ) =
+  if input is
+  {
+    []  then //we have touch the end of int8 list
+      if string_so_far is 
+      { 
+        []    then failure, //if the list of string is empty we have failed to find out words 
+        [_._] then success(reverse(string_so_far))
+      },
+    [ h . t ] then
+      if h = 32 then 
+        list_word(t, string_so_far)
+      else
+        if in_word([h], t) is (word, so_far) then
+          list_word(so_far, [implode(reverse(word)). string_so_far])
+  }.
+  
+public define Maybe(List(String))
+  list_word
+  (
+    String  input,
+    Int32   start
+  )=
+  if sub_string(input, start, length(input) - start) is
+  {
+    failure     then failure,
+    success(s)  then list_word(explode(s),[])
+  }.
+  
 /**
  * convert the content of Int32 into string
  * for example if the content of that integer is
@@ -1875,6 +1875,7 @@ public define Int32 minute(Int32 t)   = minute(convert_time(t)).
 public define Int32 second(Int32 t)   = second(convert_time(t)). 
 public define Int32 week_day(Int32 t) = week_day(convert_time(t)). 
 public define Int32 year_day(Int32 t) = year_day(convert_time(t)). 
+public define Bool  daylight_saving_time(Int32 t) = daylight_saving_time(convert_time(t)). 
  
 public define Int32 
   date_and_time
@@ -1884,9 +1885,10 @@ public define Int32
       Int32 d, 
       Int32 h, 
       Int32 mi, 
-      Int32 s
+      Int32 s,
+      Bool  dst
     ) =
-  convert_time(date_and_time(y,mo,d,h,mi,s,0,0)). 
+  convert_time(date_and_time(y,mo,d,h,mi,s,0,0,dst)). 
  
  
       *** (11.2) Calculations with UTime.
@@ -163,7 +163,7 @@ define String
      (
        Int32 t
      ) =
-   if convert_time(t) is date_and_time(year,month,day,hour,min,sec,wday,yday) then 
+   if convert_time(t) is date_and_time(year,month,day,hour,min,sec,wday,yday,dst) then 
    integer_to_string(year)+" "+format_month(month)+" "+zero_pad_2(day)+" "+
    zero_pad_2(hour)+":"+zero_pad_2(min)+":"+zero_pad_2(sec). 
  
@@ -737,7 +737,7 @@ define ServerDescription
 define String 
    make_current_journal_file_name
      =
-   if convert_time(now) is date_and_time(y,m,d,h,_,_,_,_) then 
+   if convert_time(now) is date_and_time(y,m,d,h,_,_,_,_,_) then 
    integer_to_string(y)+"_"+
    zero_pad_2(m)+"_"+
    zero_pad_2(d)+"_"+
-
+
  *Project*                             The Anubis Project
  
  *Title*                        A Multi Host HTTP/HTTPS Server
@@ -897,7 +897,7 @@ define String
 define String 
    make_current_journal_file_name
      =
-   if convert_time(now) is date_and_time(y,m,d,h,_,_,_,_) then 
+   if convert_time(now) is date_and_time(y,m,d,h,_,_,_,_,_) then 
    integer_to_string(y)+"_"+
    zero_pad_2(m)+"_"+
    zero_pad_2(d)+"_"+
@@ -3678,4 +3678,4 @@ global define One
  
  
  
-   
 \ No newline at end of file
+   
  
 minnum = 7
-relnum = 11
-bldnum = 0
+relnum = 12
+bldnum = 2
  
 package: 
 	cd ../.. && tar --exclude=CVS -chzf anubis_files.tar.gz library en fr server_certs trusted_certs