From 041426ccc1b8c46578de38cd5a816a38158a51db Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@chimrod.com>
Date: Wed, 1 Nov 2017 20:06:02 +0100
Subject: Moved range extraction function in ScTypes.ml

---
 scTypes.mli | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 scTypes.mli

(limited to 'scTypes.mli')

diff --git a/scTypes.mli b/scTypes.mli
old mode 100644
new mode 100755
index 5e5b378..de0d6f2
--- a/scTypes.mli
+++ b/scTypes.mli
@@ -6,8 +6,6 @@ type cell = (int * int) * (bool * bool)
 
 type ident = UTF8.t
 
-type 'a number_format = (float -> 'a, Format.formatter, unit) format
-
 type 'a dataFormat =
   | Date: DataType.Num.t dataFormat    (* A date in julian day *)
   | Number: DataType.Num.t dataFormat  (* Number *)
@@ -35,9 +33,6 @@ val string: DataType.String.t -> DataType.String.t types
 val boolean: DataType.Bool.t -> DataType.Bool.t types
 val date: DataType.Num.t -> DataType.Num.t types
 
-type typeContainer =
-  | Value: 'a types -> typeContainer
-
 
 (** Numeric (any format) *)
 val f_num: DataType.Num.t returnType
@@ -72,6 +67,8 @@ type result =
 
 module Type : sig
 
+  type t = Value: 'a dataFormat * 'a -> t
+
   val (=) : 'a types -> 'b types -> bool
 
   val show: UTF8.Buffer.buffer -> 'a types -> unit
@@ -91,6 +88,20 @@ module Refs : sig
   
   val shift: (int * int) -> refs -> refs
 
+  type 'a content =
+    | Value: 'a dataFormat * 'a -> 'a content
+    | List: 'a dataFormat * 'a list -> 'a list content
+    | Matrix: 'a dataFormat * 'a list list -> 'a list list content
+
+  type refContent =
+    | C: 'a content -> refContent
+
+  (** extract the content from a range.
+
+      May raise Errors.TypeError if the range cannot be unified.
+  *)
+  val get_content : result option range -> refContent
+
 end
 
 val show_expr: UTF8.Buffer.buffer -> expression -> unit
-- 
cgit v1.2.3