diff options
| author |  Unknown <t-alekm@A3479878.redmond.corp.microsoft.com> | 2011-07-06 19:56:38 -0700 |
|---|---|---|
| committer | Unknown <t-alekm@A3479878.redmond.corp.microsoft.com> | 2011-07-06 19:56:38 -0700 |
| commit | 87e454054629237ce9b2dcf2a31de059bbda1749 (patch) | |
| tree | d60355863533d17871e79c7d9bffd404e98cd5a1 /Jennisys/Ast.fs | |
| parent | 0d74db68e2fffc71f2c66de47b8d5acf89cbad6b (diff) | |
- 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
Diffstat (limited to 'Jennisys/Ast.fs')
| -rw-r--r-- | Jennisys/Ast.fs | 9 |
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
|