Removed vestiges of unsupported functionality.

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

Hide file tree

Showing 4 changed files with 1 addition and 25 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
@@ -52,7 +52,6 @@ object Lexer extends RegexParsers {
         case "requires" => RequiresT()
         case "const" => ConstT()
         case "available" => AvailableT()
-        case "ends" => EndsT()
         case "in" => InT()
         case "asset" => AssetT()
         case "disown" => DisownT()

diff --git a/src/main/scala/edu/cmu/cs/obsidian/lexer/Token.scala b/src/main/scala/edu/cmu/cs/obsidian/lexer/Token.scala
@@ -43,7 +43,6 @@ case class EnsuresT() extends Token { override def toString: String = "ensures"}
 case class RequiresT() extends Token { override def toString: String = "requires"}
 case class ConstT() extends Token { override def toString: String = "const" }
 case class AvailableT() extends Token { override def toString: String = "available" }
-case class EndsT() extends Token { override def toString: String = "ends" }
 case class InT() extends Token { override def toString: String = "in" }
 case class AssetT() extends Token { override def toString: String = "asset" }
 case class DisownT() extends Token { override def toString: String = "disown" }

diff --git a/src/main/scala/edu/cmu/cs/obsidian/parser/AST.scala b/src/main/scala/edu/cmu/cs/obsidian/parser/AST.scala
@@ -2,7 +2,7 @@ package edu.cmu.cs.obsidian.parser
 
 import scala.util.parsing.input.{NoPosition, Position}
 import edu.cmu.cs.obsidian.lexer.Token
-import edu.cmu.cs.obsidian.parser.Parser.{EndsInState, Identifier}
+import edu.cmu.cs.obsidian.parser.Parser.Identifier
 import edu.cmu.cs.obsidian.typecheck._
 
 trait HasLocation {

diff --git a/src/main/scala/edu/cmu/cs/obsidian/parser/Parser.scala b/src/main/scala/edu/cmu/cs/obsidian/parser/Parser.scala
@@ -474,17 +474,6 @@ object Parser extends Parsers {
         case ors ~ last => ors.map(_._1).toSet + last
     }
 
-    private def parseEndsInState: Parser[Set[Identifier]] =
-        EndsT() ~! InT() ~! parseStatesList ^^ {
-            case _ ~ s => s
-        }
-
-
-    private def parseEndsInStateAlt: Parser[EndsInState] =
-        EndsT() ~! InT() ~! parseStatesList ^^ {
-            case _ ~ s => EndsInState(s)
-        }
-
     private def parseEnsures = {
         EnsuresT() ~! parseExpr ~! SemicolonT() ^^ {
             case ensures ~ expr ~ _ => Ensures(expr).setLoc(ensures)
@@ -497,17 +486,6 @@ object Parser extends Parsers {
         }
     }
 
-    private def parseAvailableInAlt: Parser[AvailableIn] = {
-        AvailableT() ~! InT() ~! parseStatesList ^^ {
-            case _ ~ s => AvailableIn(s)
-        }
-    }
-
-
-    case class AvailableIn (val identifiers: Set[Identifier])
-    case class EndsInState (val identifiers: Set[Identifier])
-
-
     private def parseTransBody(isInterface:Boolean) =  {
         if(isInterface) SemicolonT() ^^ {
             case _ => Seq.empty[Statement]