From 87e454054629237ce9b2dcf2a31de059bbda1749 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 6 Jul 2011 19:56:38 -0700 Subject: - fixed some bugs with applying unification over list elements - fixed the List.jen example (generic list) - changed SeqConst and SetConst to contain a list/set of "Const" and not "Const option" like before --- Jennisys/Ast.fs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Jennisys/Ast.fs') diff --git a/Jennisys/Ast.fs b/Jennisys/Ast.fs index bd66e688..5c42dbec 100644 --- a/Jennisys/Ast.fs +++ b/Jennisys/Ast.fs @@ -13,8 +13,8 @@ type Type = | BoolType | SetType of Type (* type parameter *) | SeqType of Type (* type parameter *) - | NamedType of string - | InstantiatedType of string * Type (* type parameter *) + | NamedType of string * string list (* type parameters *) + | InstantiatedType of string * Type list (* type parameters *) type VarDecl = | Var of string * Type option @@ -61,9 +61,10 @@ type Program = type Const = | IntConst of int | BoolConst of bool - | SetConst of Set - | SeqConst of (Const option) list + | SetConst of Set + | SeqConst of Const list | NullConst + | NoneConst | ThisConst of (* loc id *) string * Type option | NewObj of (* loc id *) string * Type option | ExprConst of Expr -- cgit v1.2.3