Commit 00c2197e authored by Philipp Meyer's avatar Philipp Meyer
Browse files

Fixed lola formula parsing of identifiers

parent 6ff24ee6
...@@ -137,7 +137,6 @@ checkFile parser verbosity refine implicitProperties file = do ...@@ -137,7 +137,6 @@ checkFile parser verbosity refine implicitProperties file = do
"Places: " ++ show (length $ places net) ++ "\n" ++ "Places: " ++ show (length $ places net) ++ "\n" ++
"Transitions: " ++ show (length $ transitions net) "Transitions: " ++ show (length $ transitions net)
addedProperties <- mapM (makeImplicitProperty net) implicitProperties addedProperties <- mapM (makeImplicitProperty net) implicitProperties
print properties
rs <- mapM (checkProperty verbosity net refine) rs <- mapM (checkProperty verbosity net refine)
(addedProperties ++ properties) (addedProperties ++ properties)
verbosePut verbosity 0 "" verbosePut verbosity 0 ""
......
...@@ -18,8 +18,8 @@ languageDef = ...@@ -18,8 +18,8 @@ languageDef =
Token.commentStart = "{", Token.commentStart = "{",
Token.commentEnd = "}", Token.commentEnd = "}",
Token.commentLine = "", Token.commentLine = "",
Token.identStart = noneOf ",;:(){}\t \n\r0123456789", Token.identStart = noneOf ",;:(){}\t \n\r0123456789-",
Token.identLetter = noneOf ",;:(){}\t \n\r0123456789", Token.identLetter = noneOf ",;:(){}\t \n\r",
Token.reservedNames = ["FORMULA", "TRUE", "FALSE", Token.reservedNames = ["FORMULA", "TRUE", "FALSE",
"NOT", "AND", "OR"], "NOT", "AND", "OR"],
Token.reservedOpNames = ["<", "<=", "=", "!=", ">=", ">", Token.reservedOpNames = ["<", "<=", "=", "!=", ">=", ">",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment