Fixed lola formula parsing of identifiers

00c2197e · Philipp Meyer · 6ff24ee6 · 00c2197e · 00c2197e
Commit 00c2197e authored Jul 09, 2014 by Philipp Meyer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

src/Main.hs src/Main.hs +0 -1

src/Parser/LOLAFormula.hs src/Parser/LOLAFormula.hs +2 -2

No files found.
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -137,7 +137,6 @@ checkFile parser verbosity refine implicitProperties file = do
                "Places: " ++ show (length  $ places net) ++ "\n" ++
                "Transitions: " ++ show (length $ transitions net)
        addedProperties <- mapM (makeImplicitProperty net) implicitProperties
-        print properties
        rs <- mapM (checkProperty verbosity net refine)
                  (addedProperties ++ properties)
        verbosePut verbosity 0 ""

--- a/src/Parser/LOLAFormula.hs
+++ b/src/Parser/LOLAFormula.hs
@@ -18,8 +18,8 @@ languageDef =
                 Token.commentStart    = "{",
                 Token.commentEnd      = "}",
                 Token.commentLine     = "",
-                 Token.identStart      = noneOf ",;:(){}\t \n\r0123456789",
-                 Token.identLetter     = noneOf ",;:(){}\t \n\r0123456789",
+                 Token.identStart      = noneOf ",;:(){}\t \n\r0123456789-",
+                 Token.identLetter     = noneOf ",;:(){}\t \n\r",
                 Token.reservedNames   = ["FORMULA", "TRUE", "FALSE",
                                          "NOT", "AND", "OR"],
                 Token.reservedOpNames = ["<", "<=", "=", "!=", ">=", ">",