summaryrefslogtreecommitdiff
path: root/Util
diff options
context:
space:
mode:
authorGravatar rustanleino <unknown>2009-08-16 02:01:51 +0000
committerGravatar rustanleino <unknown>2009-08-16 02:01:51 +0000
commita4c54c653955471759da6adf28f8d6bac84bec1f (patch)
treec66b37ef0f8854fe581a078d5e4ca4aa1071bf59 /Util
parent3bd44c8d3a6780bbeea6bfedfe09732b83215271 (diff)
* Implemented channels
- channel declarations - send and receive statements - bounds clause for new, to accommodate channels - Added ProdConsChannel.chalice test case - Resolve and Translate (but no Compile yet) - Added Credits to global state in encoding (this caused changes to lots of source lines) * Simplified meaning of maxlock==E * Various parser improvements * Added alternative syntax for eval statements * Some renamings in error messages (e.g., install -> reorder) * Added preliminary parsing for condition variables and their wait and signal operations * Added new keywords to Chalice emacs mode
Diffstat (limited to 'Util')
-rw-r--r--Util/Emacs/chalice-mode.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/Util/Emacs/chalice-mode.el b/Util/Emacs/chalice-mode.el
index 91c69120..7a6b6d4c 100644
--- a/Util/Emacs/chalice-mode.el
+++ b/Util/Emacs/chalice-mode.el
@@ -32,14 +32,15 @@
`(,(chalice-regexp-opt '(
"class" "ghost" "var" "const" "external" "function" "method"
"predicate" "returns" "requires" "ensures" "lockchange"
- "invariant"
+ "invariant" "channel" "condition" "where"
)) . font-lock-builtin-face)
`(,(chalice-regexp-opt '(
"above" "acc" "acquire" "and" "assert" "assigned" "assume"
- "below" "between" "call"
+ "below" "between" "call" "credit"
"downgrade" "else" "eval" "exists" "fold" "forall" "fork" "free" "havoc" "holds"
"if" "in" "install" "ite" "join" "lock" "lockbottom" "maxlock" "module" "new" "nil"
- "old" "rd" "release" "result" "share" "this" "unfold" "unfolding" "unshare" "while"
+ "old" "rd" "receive" "release" "result" "send" "share"
+ "this" "unfold" "unfolding" "unshare" "while"
"false" "true" "null")) . font-lock-keyword-face)
`(,(chalice-regexp-opt '("bool" "int" "seq" "token")) . font-lock-type-face)
)