Nested vectors are implemented, including parser and class nstio.

[Faustine.git] / interpreter / types.ml

diff --git a/interpreter/types.ml b/interpreter/types.ml
index 585b0ed..aa82868 100644 (file)
--- a/interpreter/types.ml
+++ b/interpreter/types.ml
@@ -24,6 +24,7 @@ class type value_type =
     method to_float_array : float array
     method of_float_array : float array -> value_type
     method to_string : string
     method to_float_array : float array
     method of_float_array : float array -> value_type
     method to_string : string

+    method to_neststring : string

     method normalize : unit
     method add : value_type -> value_type
     method neg : value_type
     method normalize : unit
     method add : value_type -> value_type
     method neg : value_type


@@ -216,6 +217,8 @@ type matrix = float array array;;
 
 type data = float array array array;;
 
 
 type data = float array array array;;
 

+type raw_data = value_type array array;;
+

 class type beam_type =
     object
       method get : signal_type array
 class type beam_type =
     object
       method get : signal_type array


@@ -226,6 +229,7 @@ class type beam_type =
       method matching : int -> beam_type
       method at : time -> value_type array
       method output : int -> data
       method matching : int -> beam_type
       method at : time -> value_type array
       method output : int -> data

+      method output_values : int -> raw_data

       method frequency : rate_type array
     end;;
 
       method frequency : rate_type array
     end;;
 


@@ -257,3 +261,10 @@ class type io_type =
       method read : string array -> beam_type
       method write : rate_type array -> data -> string * string -> string array
     end;;
       method read : string array -> beam_type
       method write : rate_type array -> data -> string * string -> string array
     end;;

+
+
+type nest =
+         Scalar of float
+       | Vector of nestpar
+and nestpar = Unary of nest
+            | Binary of nest * nestpar;;
\ No newline at end of file