no message

David René
1 parent a827e58d
Showing 5 changed files with 363 additions and 44 deletions Show diff stats
anubis_dev/library/network/tools.anubis
anubis_dev/library/system/convert.anubis
anubis_dev/library/system/files.anubis
anubis_dev/library/system/muscle.anubis
anubis_dev/library/system/types.anubis
@@ -141,8 +141,8 @@ public define Int64
         b2 = int8_to_int32(force_nth(2, src)),
         b1 = int8_to_int32(force_nth(1, src)),
         b0 = int8_to_int32(force_nth(0, src)),
-   int64( b0 | (b1 << 8) | (b2 << 16) | (b3 << 24),
-          b4 | (b5 << 8) | (b6 << 16) | (b7 << 24)).
+   int64( b4 | (b5 << 8) | (b6 << 16) | (b7 << 24),   //high
+          b0 | (b1 << 8) | (b2 << 16) | (b3 << 24)).  //low
  
 public define Maybe(Float)
   lendian_to_host_Float64
@@ -5,29 +5,136 @@ read system/string.anubis
  
 //TODO manage the real endianness of the host
  
+
+public define ByteArray reverse(ByteArray source).
+
+public define ByteArray
+  to_ByteArray
+  (
+    Bool  value
+  )=
+  with ba = constant_byte_array(1,0),
+  if value then
+    forget(put(ba,0,1));
+    ba
+  else
+    //already to 0, then return the ByteArray
+    ba.
+    
+public define ByteArray
+  to_ByteArray
+  (
+    Int8  value
+  )=
+  constant_byte_array(1,value).
+  
+
 public define ByteArray
   host_to_lendian_Int16_ByteArray
   (
-    Int16  value,
+     Int16 value,
   ) =
-  with ba = constant_byte_array(2,0),
-   forget(put(ba,0,value.low)); 
-   forget(put(ba,1,value.high));
+  //create the ByteArray which will receive the result
+  with  ba = constant_byte_array(2, 0),  
+  
+  if host_endian is 
+  {
+    little  then  
+      forget(put(ba,1,value.high)); 
+      forget(put(ba,0,value.low )),
+    big     then
+      forget(put(ba,1,value.low)); 
+      forget(put(ba,0,value.high))
+  };
+  //return the result ByteArray
    ba.
-
-
+   
 public define ByteArray
   host_to_lendian_Int32_ByteArray
   (
      Int32 value,
   ) =
-  with  ba = constant_byte_array(4, 0),
-   forget(put(ba,0,truncate_to_int8( value>>24) )); 
-   forget(put(ba,1,truncate_to_int8((value>>16) & 0xFF)));
-   forget(put(ba,2,truncate_to_int8((value>>8) & 0xFF))); 
-   forget(put(ba,3,truncate_to_int8( value & 0xFF)));
-   ba.  
+  //create the ByteArray which will receive the result
+  with  ba = constant_byte_array(4, 0),  
+  
+  if host_endian is 
+  {
+    little  then  
+      forget(put(ba,3,truncate_to_int8( value>>24) )); 
+      forget(put(ba,2,truncate_to_int8((value>>16) & 0xFF)));
+      forget(put(ba,1,truncate_to_int8((value>>8)  & 0xFF))); 
+      forget(put(ba,0,truncate_to_int8( value      & 0xFF))),
+    big     then
+      forget(put(ba,0,truncate_to_int8( value>>24) )); 
+      forget(put(ba,1,truncate_to_int8((value>>16) & 0xFF)));
+      forget(put(ba,2,truncate_to_int8((value>>8)  & 0xFF))); 
+      forget(put(ba,3,truncate_to_int8( value      & 0xFF)))
+  };
+  //return the result ByteArray
+   ba.
+
+public define ByteArray
+  host_to_lendian_Int64_ByteArray
+  (
+     Int64 value,
+  ) =
+  if host_endian is 
+  {
+    little  then  
+      host_to_lendian_Int32_ByteArray(value.low) +
+      host_to_lendian_Int32_ByteArray(value.high),
+    big     then
+      host_to_lendian_Int32_ByteArray(value.high) +
+      host_to_lendian_Int32_ByteArray(value.low)
+  }.
+
+
+public define ByteArray
+  host_to_lendian_Float64_ByteArray
+  (
+    Float value
+  )=
+  with ba = serialize(value),
+  if host_endian is
+  {
+    little  then  ba,
+    big     then  reverse(ba)
+  }.
  
+public define ByteArray
+  host_to_lendian_Float32_ByteArray
+  (
+    Float32 val
+  )=
+ host_to_lendian_Int32_ByteArray(val.value).
+  
+public define ByteArray
+  host_to_lendian_B_Point_ByteArray
+  (
+    B_Point  value
+  ) =
+  host_to_lendian_Float32_ByteArray(value.x) +
+  host_to_lendian_Float32_ByteArray(value.y).
+  
+public define ByteArray
+  host_to_lendian_B_Rect_ByteArray
+  (
+    B_Rect  value
+  ) =
+  if value is
+  {
+     rect(left_top, right_bottom)   then
+      host_to_lendian_B_Point_ByteArray(left_top)   +
+      host_to_lendian_B_Point_ByteArray(right_bottom),
+      
+     rect(left, top, right, bottom) then
+      host_to_lendian_Float32_ByteArray(left)   +
+      host_to_lendian_Float32_ByteArray(top)    +
+      host_to_lendian_Float32_ByteArray(right)  +
+      host_to_lendian_Float32_ByteArray(bottom)      
+  }
+  .
+  
 define ByteArray 
   reverse
   (
@@ -3,7 +3,7 @@
  
  *Title*                  generic files functions. 
  
- *Copyright*       Copyright (c) David René 2006. 
+ *Copyright*       Copyright (c) David René 2006-2007. 
  
  
  
@@ -28,14 +28,9 @@ public define Int32 _CURRENT_PROTOCOL_VERSION = 1347235888. // &#39;PM00&#39; -- our mag
 public type Message:...
  
 define Maybe(Message) unflatten_message ( RAddr(Int8) stream ).
+define Maybe(ByteArray) flatten_message ( Message msg ).
  
  
-public type B_Point:
-  point(Float32 x, Float32 y).
-
-public type B_Rect:
-  rect(B_Point up_left, B_Point down_right),
-  rect(Float32 x, Float32 y, Float32 x1, Float32 y1).
  
 type Muscle_object:
   b_bool(Bool),
@@ -87,6 +82,31 @@ public type Message:
     Var(List(Message_field))  fields
   ).
  
+define Int32 
+  get_Int32_type_code
+  (
+    Muscle_type type_code
+  )=
+  if type_code is
+  {
+     b_any_t      then  _B_ANY_TYPE,
+     b_bool_t     then  _B_BOOL_TYPE,
+     b_double_t   then  _B_DOUBLE_TYPE,
+     b_float_t    then  _B_FLOAT_TYPE,
+     b_int64_t    then  _B_INT64_TYPE,
+     b_int32_t    then  _B_INT32_TYPE,
+     b_int16_t    then  _B_INT16_TYPE,
+     b_int8_t     then  _B_INT8_TYPE,
+     b_message_t  then  _B_MESSAGE_TYPE,
+     b_pointer_t  then  _B_POINTER_TYPE,
+     b_point_t    then  _B_POINT_TYPE,
+     b_rect_t     then  _B_RECT_TYPE,
+     b_string_t   then  _B_STRING_TYPE,
+     b_custom_t(v)then  v,  
+     b_raw_t      then  _B_RAW_TYPE,
+  }
+  .
+  
 define Maybe(Muscle_type)
   get_muscle_type
   (
@@ -108,12 +128,16 @@ define Maybe(Muscle_type)
     success(b_int8_t)
   else if type_code = _B_MESSAGE_TYPE then
     success(b_message_t)    
-  else if type_code = _B_STRING_TYPE then
-    success(b_string_t)
+  else if type_code = _B_POINTER_TYPE then
+    success(b_message_t)    
   else if type_code = _B_POINT_TYPE then
     success(b_point_t)
   else if type_code = _B_RECT_TYPE then
     success(b_rect_t)
+  else if type_code = _B_STRING_TYPE then
+    success(b_string_t)
+  else if type_code = _B_RAW_TYPE then
+    success(b_raw_t)
   else
     print("muscle custom type " + to_hexa(type_code) + "\n");
     success(b_custom_t(type_code)).
@@ -124,7 +148,7 @@ public define One
   (
     Message msg
   )=
-  print("Message: what = " + *msg.what + ", ASCII = \"" + to_ascii(*msg.what) + "\", Hexa = 0x" + to_hexa(*msg.what) + 
+  print("Message: what = " + *msg.what + ", ASCII = \"" + to_ascii(*msg.what) + "\", Hexa = 0x" + to_hexa(*msg.what) + "\n" +
         "entry count=" + *msg.numField +"\n").
  
  
@@ -670,14 +694,175 @@ define  Maybe(List(Message_field))
     }.
  
 define Maybe(ByteArray)
+  flatten_items
+  (
+    Muscle_type         type_code,
+    List(Muscle_object) m_o,
+    ByteArray           so_far
+  )=
+  if m_o is
+  {
+    []      then success(so_far),
+    [h . t] then
+    if h is
+    {
+      b_bool(data)        then
+        flatten_items(type_code, t, so_far + to_ByteArray(data)),
+      
+      b_double(data)      then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Float64_ByteArray(data)),
+      
+      b_float(data)       then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Float32_ByteArray(data)),
+        
+     b_int64(data)        then
+        flatten_items(type_code, t, so_far + host_to_lendian_Int64_ByteArray(data)),
+        
+     b_int32(data)        then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(data)),
+        
+     b_int16(data)        then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Int16_ByteArray(data)),
+        
+     b_int8(data)         then  
+        flatten_items(type_code, t, so_far + to_ByteArray(data)),
+
+     b_message(data)      then  
+        with result = flatten_message(data),
+        if result is
+        {
+          failure           then  failure,
+          success(message)  then
+            flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(length(message)) + message),             
+        }
+     b_pointer(data)      then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(data)),
+        
+     b_point(data)        then  
+        flatten_items(type_code, t, so_far + host_to_lendian_B_Point_ByteArray(data)),
+        
+     b_rect(data)         then
+        flatten_items(type_code, t, so_far + host_to_lendian_B_Rect_ByteArray(data)),
+     b_string(data)       then
+        flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(length(data)+1)
+                                           + to_byte_array(data) 
+                                           + constant_byte_array(1,0)),
+        
+     b_custom(data)       then  
+        flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(length(data)) + data),
+     b_raw(data)          then
+        flatten_items(type_code, t, so_far + host_to_lendian_Int32_ByteArray(length(data)) + data)
+    }
+  }.
+  
+define Maybe(ByteArray)
+  flatten_one_field
+  (
+    Muscle_type         type_code,
+    List(Muscle_object) m_o
+  )=
+  with result = flatten_items(type_code, m_o, constant_byte_array(0, 0)),
+  if result is
+  {
+    failure             then failure
+    success(flat_items) then
+      if type_code is
+      {
+        b_any_t then  failure,
+        
+        b_bool_t then 
+          success(host_to_lendian_Int32_ByteArray(length(m_o)) + flat_items )
+          
+        b_double_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<3) + flat_items )
+          
+        b_float_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<2) + flat_items )
+        b_int64_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<3) + flat_items )
+        b_int32_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<2) + flat_items )
+        b_int16_t then
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<1) + flat_items )    
+        b_int8_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)) + flat_items )
+        b_message_t then
+          success(host_to_lendian_Int32_ByteArray(length(flat_items)) + flat_items )
+        b_pointer_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)) + flat_items )
+        b_point_t then
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<3) + flat_items )   
+        b_rect_t then  
+          success(host_to_lendian_Int32_ByteArray(length(m_o)<<4) + flat_items )        
+        b_string_t then  
+          success(host_to_lendian_Int32_ByteArray(length(flat_items) + 4) + //size of all items
+                  host_to_lendian_Int32_ByteArray(length(m_o)) +        //number of items
+                  flat_items )
+        b_custom_t(Int32 _0) then
+          success(host_to_lendian_Int32_ByteArray(length(flat_items) + 4) + //size of all items
+                  host_to_lendian_Int32_ByteArray(length(m_o)) +        //number of items
+                  flat_items )
+        b_raw_t then  
+          success(host_to_lendian_Int32_ByteArray(length(flat_items) + 4) + //size of all items
+                  host_to_lendian_Int32_ByteArray(length(m_o)) +        //number of items
+                  flat_items )
+      }
+   }
+  .
+  
+define Maybe(ByteArray)
+  flatten_fields
+  (
+    List(Message_field) fields,
+    ByteArray           so_far
+  )=
+  if fields is
+  {
+    [ ]       then failure,
+    [ h . t ] then
+      //write size of name + 1 for NULL erminated string
+      with flatten_header = host_to_lendian_Int32_ByteArray(length(h.name)+1) +
+      //write the name + NULL
+                            to_byte_array(h.name) + constant_byte_array(1,0) +
+      //write the type_code of the field
+                            host_to_lendian_Int32_ByteArray(get_Int32_type_code(h.type_code))
+                            ,
+                            
+      if flatten_one_field(h.type_code , *h.items) is
+      {
+        failure               then  failure,
+        success(flatten_body) then
+        if t is 
+        {
+          []      then  success(so_far + flatten_header + flatten_body),
+          [_ ._]  then  flatten_fields(t, so_far + flatten_header + flatten_body )
+        }
+      }
+  }.  
+    
+  /**
+   *  Converts the given Message into a flattened buffer of bytes (ByteArray) that can be saved to disk
+   *  or sent over a network, and later converted back into an identical Message type.
+   *  @param msg  The message to be flatten
+   *  @return     failure if any error occur otherwise the ByteArray with the flattened message
+   */
+define Maybe(ByteArray)
   flatten_message
   (
     Message msg
   )=
-  with flatten_message = host_to_lendian_Int32_ByteArray(_CURRENT_PROTOCOL_VERSION) +
-    host_to_lendian_Int32_ByteArray(*msg.what),
-    success(flatten_message).
-  
+  with message_header = 
+    host_to_lendian_Int32_ByteArray(_CURRENT_PROTOCOL_VERSION) +
+    host_to_lendian_Int32_ByteArray(*msg.what) +
+    host_to_lendian_Int32_ByteArray(length(*msg.fields)),
+    
+    if flatten_fields(*msg.fields, to_byte_array("")) is
+    {
+      failure                   then  failure
+      success(flattened_fields) then  success(message_header + flattened_fields)
+    }.
+   
+
    /* Format:  0. Protocol revision number (4 bytes, always set to CURRENT_PROTOCOL_VERSION) */
    /*          1. 'what' code (4 bytes)                                                      */
    /*          2. Number of entries (4 bytes)                                                */
@@ -1403,7 +1588,7 @@ global define One
   (
     List(String)  args
   ) =
-  if (Maybe(RAddr(Int8)))file("c:/muscle/python/test.msg", read) is
+  if (Maybe(RAddr(Int8)))file("c:/muscle/python/test_multi_msg.msg", read) is
   {
      failure          then print("Open file Error\n"),
      success(source)  then 
@@ -1412,18 +1597,31 @@ global define One
         failure           then print("File Message ERROR \n"),
         success(message)  then 
           print("File Message decoded\n");
-          print_to_stream(message);
-        if find_message(message, "message") is
-        {
-          failure               then print("Can't find message \"message\" \n"),
-          success(sub_message)  then
-            forget(add_string(sub_message, "toto", "tata"));
-            if find_string(sub_message, "toto") is
+          print_to_stream(message);/*
+          if find_message(message, "message") is
+          {
+            failure               then print("Can't find message \"message\" \n"),
+            success(sub_message)  then
+              forget(add_string(sub_message, "toto", "tata"));
+              if find_string(sub_message, "toto") is
+              {
+                failure             then print("can't find string \"string\" \n"),
+                success(the_string) then print("the string found is [" + the_string + "] \n")
+                              
+              }
+          };*/
+          if flatten_message(message) is
+          {
+            failure         then print("Can't flatten message\n"),
+            success(ba_msg) then 
+            //now write the result into file
+            if file("c:/muscle/python/Anubis.test_multi_msg.msg", new) is
             {
-              failure             then print("can't find string \"string\" \n"),
-              success(the_string) then print("the string found is [" + the_string + "] \n")
+              failure     then print("Can't open file \n"),
+              success(fd) then forget(write(weaken(fd), ba_msg))
             }
-        }
+            
+          }
       }
   }
   .
@@ -2,10 +2,29 @@
  
 read tools/basis.anubis
  
+public type Endian:
+  little,
+  big.
+
+public define Endian host_endian = little.
  
 public type Int16:
   int16(Int8 high, Int8 low).
+  
+public type Int64:
+  int64(Int32 high, Int32 low).
+
+public type Float32:
+  float32(Int32 value).
+  
+public type B_Point:
+  point(Float32 x, Float32 y).
  
+public type B_Rect:
+  rect(B_Point left_top, B_Point right_bottom),
+  rect(Float32 left, Float32 top, Float32 right, Float32 bottom).
+  
+  
 public define Int32
   to_Int32
   (
@@ -21,13 +40,8 @@ public define String
    Int16 i + String s =
       integer_to_string(to_Int32(i)) + s. 
  
-public type Int64:
-  int64(Int32 high, Int32 low).
  
  
-public type Float32:
-  float32(Int32 value).
-
  
 define Bool
   compare_all_bytes