isa-parser: add parsing for case of; add parsing for ConstTerm IntLit…

…eral (only supports nat for now
au-ts · Jan 17, 2020 · e2d8845 · e2d8845
1 parent db74ee9
commit e2d8845
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/isa-parser/Isabelle/Parser.hs b/isa-parser/Isabelle/Parser.hs
@@ -626,7 +626,11 @@ termL = buildExpressionParser table restL
 
 
     restL =  antiquoteTermL <||> parensTermL <||> constTermL <||> (TermIdent <$> innerIdentL) <||> 
+<<<<<<< HEAD
              caseOfTermL <||> recordUpdTermL <||> recordDclTermL <||> ifThenElseTermL <||> 
+=======
+             caseOfTermL <||> recordUpdTermL <||> recordDclTermL <||> ifThenElseTermL 
+>>>>>>> isa-parser: add parsing for case of; add parsing for ConstTerm IntLiteral (only supports nat for now
     parensTermL = parensL termL
 
 ifThenElseTermL :: ParserM Term