summaryrefslogtreecommitdiff
path: root/Jennisys/Ast.fs
diff options
context:
space:
mode:
Diffstat (limited to 'Jennisys/Ast.fs')
-rw-r--r--Jennisys/Ast.fs9
1 files changed, 5 insertions, 4 deletions
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<Const option>
- | SeqConst of (Const option) list
+ | SetConst of Set<Const>
+ | SeqConst of Const list
| NullConst
+ | NoneConst
| ThisConst of (* loc id *) string * Type option
| NewObj of (* loc id *) string * Type option
| ExprConst of Expr