Fix update

viperproject · Jan 16, 2024 · 9f7f099 · 9f7f099
1 parent 0713de1
commit 9f7f099
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/silver b/silver
diff --git a/src/main/scala/extensions/TryBlockParserPlugin.scala b/src/main/scala/extensions/TryBlockParserPlugin.scala
@@ -11,16 +11,13 @@ import viper.silver.plugin.{ParserPluginTemplate, SilverPlugin}
 
 class TryBlockParserPlugin(fp: FastParser) extends SilverPlugin with ParserPluginTemplate {
   import fastparse._
-  import viper.silver.parser.FastParserCompanion.whitespace
-  import fp.{FP, stmtBlock, ParserExtension}
+  import viper.silver.parser.FastParserCompanion.{PositionParsing, reservedKw, whitespace}
+  import fp.{ParserExtension, lineCol, _file, stmtBlock}
 
-
-  private val tryKeyword = "try"
-
-  def tryBlock[_:P]: P[PTryBlock] =FP("try" ~/ stmtBlock) map { case (pos, s) => PTryBlock(s)(pos) }
+  def tryBlock[$: P]: P[PTryBlock] = P((P(PTryKeyword) ~ stmtBlock()) map (PTryBlock.apply _).tupled).pos
 
   override def beforeParse(input: String, isImported: Boolean): String = {
-    ParserExtension.addNewKeywords(Set(tryKeyword))
+    ParserExtension.addNewKeywords(Set(PTryKeyword.keyword))
     ParserExtension.addNewStmtAtEnd(tryBlock(_))
 
     input

diff --git a/src/main/scala/extensions/TryBlockStmt.scala b/src/main/scala/extensions/TryBlockStmt.scala
@@ -8,9 +8,16 @@ package viper.silicon.extensions
 
 import viper.silver.ast._
 import viper.silver.ast.pretty.PrettyPrintPrimitives
-import viper.silver.parser.{NameAnalyser, PExtender, PNode, PStmt, Translator, TypeChecker}
+import viper.silver.parser.{NameAnalyser, PExtender, PNode, PStmt, Translator, TypeChecker, PKw, PKeywordStmt, PReserved}
+import viper.silver.ast.utility.lsp.BuiltinFeature
 
-final case class PTryBlock(body: PStmt)(val pos: (Position, Position) = (NoPosition, NoPosition)) extends PExtender with PStmt {
+/** Keyword used to define `try` statement. */
+case object PTryKeyword extends PKw("try", TODOTryDoc) with PKeywordStmt
+case object TODOTryDoc extends BuiltinFeature(
+  """TODO""".stripMargin.replaceAll("\n", " ")
+)
+
+final case class PTryBlock(kw: PReserved[PTryKeyword.type], body: PStmt)(val pos: (Position, Position) = (NoPosition, NoPosition)) extends PExtender with PStmt {
   override val getSubnodes: Seq[PNode] = Seq(body)
 
   override def translateStmt(translator: Translator): Stmt = {