Removed deprecated "parent" keyword.

mcoblenz · Dec 10, 2019 · a99b800 · a99b800
1 parent 1bca2a5
commit a99b800
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/main/scala/edu/cmu/cs/obsidian/lexer/Lexer.scala b/src/main/scala/edu/cmu/cs/obsidian/lexer/Lexer.scala
@@ -45,7 +45,6 @@ object Lexer extends RegexParsers {
         case "true" => TrueT()
         case "false" => FalseT()
         case "this" => ThisT()
-        case "parent" => ParentT()
         case "import" => ImportT()
         case "remote" => RemoteT()
         case "ensures" => EnsuresT()

diff --git a/src/main/scala/edu/cmu/cs/obsidian/lexer/Token.scala b/src/main/scala/edu/cmu/cs/obsidian/lexer/Token.scala
@@ -36,7 +36,6 @@ case class BoolT() extends Token { override def toString: String = "bool"}
 case class TrueT() extends Token { override def toString: String = "true"}
 case class FalseT() extends Token { override def toString: String = "false"}
 case class ThisT() extends Token { override def toString: String = "this"}
-case class ParentT() extends Token { override def toString: String = "parent"}
 case class ImportT() extends Token { override def toString: String = "import"}
 case class RemoteT() extends Token { override def toString: String = "remote"}
 case class EnsuresT() extends Token { override def toString: String = "ensures"}

diff --git a/src/main/scala/edu/cmu/cs/obsidian/parser/Parser.scala b/src/main/scala/edu/cmu/cs/obsidian/parser/Parser.scala
@@ -437,12 +437,11 @@ object Parser extends Parsers {
             parseTrue | parseFalse | parseNumLiteral | parseStringLiteral
 
         val parseThis = { ThisT() ^^ (t => This().setLoc(t))}
-        val parseParent = { ParentT() ^^ (p => Parent().setLoc(p))}
 
         val fail = failure("expression expected")
 
         val simpleExpr: Parser[Expression] =
-            parseThis | parseParent | parseNew | parseLocalInv |
+            parseThis | parseNew | parseLocalInv |
             parseLiterals | parseStateInitializer | parseVar | parenExpr | fail
 
         simpleExpr ~ parseDots ^^ { case e ~ applyDots => applyDots(e) }