diff options
| author |  qadeer <qadeer@microsoft.com> | 2011-10-27 08:46:56 -0700 |
|---|---|---|
| committer | qadeer <qadeer@microsoft.com> | 2011-10-27 08:46:56 -0700 |
| commit | 8981d5d17facd253f22c20904e39d680394e426f (patch) | |
| tree | 05a81d59b1f095263fd3f5062b861ab0e37b3b65 /Util/VS2010 | |
| parent | f8fa534be137bd660462db0829f030c2f2e783d5 (diff) | |
| parent | d2cd087ebd9ff568c1712254eab864aeb4205e02 (diff) | |
Merge
Diffstat (limited to 'Util/VS2010')
| -rw-r--r-- | Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs | 5 | ||||
| -rw-r--r-- | Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs index df0f22ee..6f9ec810 100644 --- a/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs +++ b/Util/VS2010/Dafny/DafnyLanguageService/Grammar.cs @@ -20,7 +20,7 @@ namespace Demo "assert", "assume", "new", "this", "object", "refines", "replaces", "by",
"unlimited", "module", "imports",
"if", "then", "else", "while", "invariant",
- "break", "label", "return", "foreach", "havoc", "print",
+ "break", "label", "return", "parallel", "havoc", "print",
"returns", "requires", "ensures", "modifies", "reads", "decreases",
"bool", "nat", "int", "false", "true", "null",
"function", "free",
@@ -238,7 +238,6 @@ namespace Demo | "if" + Condition + Statement + PreferShiftHere() + "else" + Statement
| "while" + Condition + loopSpec.Star() + Statement
| "for" + LParen + expression.Q() + Semi + expression.Q() + Semi + expression.Q() + RParen + Statement
- | "foreach" + LParen + ident + "in" + expression + RParen + Statement
| blockStatement
| expression + Semi
| "break" + Semi
@@ -286,7 +285,7 @@ namespace Demo | "break"
| "label"
| "return"
- | "foreach"
+ | "parallel"
| "havoc"
| "print"
| "returns"
diff --git a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs index 619f5f8d..f80acc26 100644 --- a/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs +++ b/Util/VS2010/DafnyExtension/DafnyExtension/TokenTagger.cs @@ -251,7 +251,6 @@ namespace DafnyLanguage case "exists":
case "false":
case "forall":
- case "foreach":
case "free":
case "fresh":
case "function":
@@ -272,6 +271,7 @@ namespace DafnyLanguage case "null":
case "object":
case "old":
+ case "parallel":
case "print":
case "reads":
case "refines":
|