HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additions while poking around people's configs
[hcoop/domtool2.git]
/
src
/
ast.sml
diff --git
a/src/ast.sml
b/src/ast.sml
index
0e8688d
..
d4c5727
100644
(file)
--- a/
src/ast.sml
+++ b/
src/ast.sml
@@
-1,5
+1,5
@@
(* HCoop Domtool (http://hcoop.sourceforge.net/)
(* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006, Adam Chlipala
+ * Copyright (c) 2006
-2007
, Adam Chlipala
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-80,7
+80,7
@@
datatype exp' =
(* Do-nothing action *)
| ESet of string * exp
(* Set an environment variable *)
(* Do-nothing action *)
| ESet of string * exp
(* Set an environment variable *)
- | EGet of string * string * exp
+ | EGet of string *
typ option *
string * exp
(* Get an environment variable *)
| ESeq of exp list
(* Monad sequencer; execute a number of commands in order *)
(* Get an environment variable *)
| ESeq of exp list
(* Monad sequencer; execute a number of commands in order *)
@@
-91,6
+91,8
@@
datatype exp' =
(* Apply a TNested to an action *)
| EALam of string * pred * exp
(* Abstraction for building TNested values *)
(* Apply a TNested to an action *)
| EALam of string * pred * exp
(* Abstraction for building TNested values *)
+ | EIf of exp * exp * exp
+ (* If..then..else *)
withtype exp = exp' * position
datatype decl' =
withtype exp = exp' * position
datatype decl' =