Merge pull request #1599 from spechub/1598_error_when_parsing_filtering

added 'extract' and 'remove' as keywords

Common/Keywords.hs

@@ -438,6 +438,9 @@ etypeS = "etype"
 existsS :: String
 existsS = "exists"
 
+extractS :: String
+extractS = "extract"
+
 falseS :: String
 falseS = "false"
 
@@ -565,6 +568,9 @@ refinementS = "refinement"
 rejectS :: String
 rejectS = "reject"
 
+removeS :: String
+removeS = "remove"
+
 resultS :: String
 resultS = "result"
 

Common/Token.hs

@@ -112,8 +112,8 @@ criticalKeywords = terminatingKeywords ++ startingKeywords
 -- | keywords terminating a basic spec
 terminatingKeywords :: [String]
 terminatingKeywords =
-    [ andS, endS, fitS, forgetS, hideS, keepS, rejectS, revealS, selectS
-    , thenS, withS, withinS, ofS, forS, toS, intersectS]
+    [ andS, endS, extractS, fitS, forgetS, hideS, keepS, rejectS, removeS, 
+      revealS, selectS, thenS, withS, withinS, ofS, forS, toS, intersectS]
 
 -- | keywords starting a library item
 startingKeywords :: [String]

Syntax/Parse_AS_Structured.hs

@@ -388,9 +388,9 @@ minimization lg = do
 
 extraction :: LogicGraph -> AParser st EXTRACTION
 extraction lg = do
-  p <- asKey "extract" <|> asKey "remove"
+  p <- asKey extractS <|> asKey removeS
   is <- many1 (hetIRI lg)
-  return . ExtractOrRemove (tokStr p == "extract") is $ tokPos p
+  return . ExtractOrRemove (tokStr p == extractS) is $ tokPos p
 
 filtering :: LogicGraph -> AParser st FILTERING
 filtering lg = do