implement enums (#10)

Author: andrlime

lib/header.ml

@@ -2,6 +2,7 @@ open Sexplib.Std
 
 module T = struct
   type t =
+    | Enum of string * string (* (type * name) *)
     | String of string
     | Boolean of string
     | Float of string
@@ -14,6 +15,7 @@ module T = struct
 
   let to_string hdr =
     match hdr with
+    | Enum (t, s) -> s ^ ": " ^ t ^ ";"
     | String s -> s ^ ": string;"
     | Boolean s -> s ^ ": boolean;"
     | Float s -> s ^ ": number;"
@@ -23,6 +25,7 @@ module T = struct
 
   let get_string hdr =
     match hdr with
+    | Enum (_, s) -> s
     | String s -> s
     | Boolean s -> s
     | Float s -> s

lib/header.mli

@@ -1,5 +1,6 @@
 module T : sig
   type t =
+    | Enum of string * string (* (type * name) *)
     | String of string
     | Boolean of string
     | Float of string

lib/literal.ml

@@ -2,6 +2,7 @@ open Sexplib.Std
 
 module T = struct
   type t =
+    | Enum of string * string
     | String of string
     | Integer of int
     | Float of float
@@ -14,6 +15,7 @@ module T = struct
 
   let get_type t =
     match t with
+    | Enum (t, _) -> t
     | String _ -> "string"
     | Integer _ -> "number"
     | Float _ -> "number"
@@ -22,6 +24,7 @@ module T = struct
 
   let get_value t =
     match t with
+    | Enum (_, e) -> e
     | String s -> Util.T.quote s
     | Integer i -> string_of_int i
     | Float f -> string_of_float f

lib/literal.mli

@@ -1,5 +1,6 @@
 module T : sig
   type t =
+    | Enum of string * string
     | String of string
     | Integer of int
     | Float of float

lib/record.ml

@@ -2,6 +2,7 @@ open Sexplib.Std
 
 module Value = struct
   type record_type =
+    | Enum of string
     | String of string
     | Integer of int
     | Float of float
@@ -14,6 +15,11 @@ module Value = struct
     }
   [@@deriving sexp]
 
+  let parse_enum str =
+    if not (Variable.T.is_valid str) then failwith ("invalid enum name " ^ str);
+    Enum str
+  ;;
+
   let parse_string str = String str
 
   let parse_boolean str =
@@ -38,6 +44,7 @@ module Value = struct
 
   let from_header (header, element) =
     match (header : Header.T.t) with
+    | Enum (_, name) -> { name; value = parse_enum element }
     | String name -> { name; value = parse_string element }
     | Boolean name -> { name; value = parse_boolean element }
     | Integer name -> { name; value = parse_integer element }
@@ -46,6 +53,7 @@ module Value = struct
 
   let get_value t =
     match t with
+    | Enum e -> e
     | String s -> Util.T.quote s
     | Integer i -> string_of_int i
     | Float f -> string_of_float f

lib/record.mli

@@ -1,5 +1,6 @@
 module Value : sig
   type record_type =
+    | Enum of string
     | String of string
     | Integer of int
     | Float of float

test/expect_tests/cases/data/sample_spreadsheet_enums.csv

@@ -0,0 +1,6 @@
+(Enum Something a)
+A
+B
+C
+D
+E

test/expect_tests/cases/data/sample_spreadsheet_long.csv

@@ -1,4 +1,4 @@
-(String a),(String b),(String c),(Float ab),(Integer bc),(Boolean cd),(Number de)
+(Enum Type a),(String b),(String c),(Float ab),(Integer bc),(Boolean cd),(Number de)
 Alpha,Beta,Gamma,0.5,10,true,3
 Delta,Echo,Foxtrot,1.2,21,false,7
 Giga,Hera,Iota,2.4,32,true,5

test/expect_tests/cases/enum_program_test.sexp

@@ -0,0 +1,5 @@
+(
+	(Import ((var Something) (from some-file.ts)))
+	(ReadSpreadsheet ((var "SOME_SHEET") (interface "Type") (path (Csv "./data/sample_spreadsheet_enums.csv"))))
+	(Export Stdout)
+)