From: Anders Mörtberg <mortberg@chalmers.se>
Date: Thu, 19 Mar 2015 06:36:29 +0000 (+0100)
Subject: Fix a typo in the parser
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=29da8c48b3feb58a1b5741d1718f172e21710719;p=cubicaltt.git

Fix a typo in the parser
---

diff --git a/Exp.cf b/Exp.cf
index 5a4a1e7..6386d33 100644
--- a/Exp.cf
+++ b/Exp.cf
@@ -38,14 +38,12 @@ Trans.      Exp3 ::= "transport" ;
 Pair.       Exp3 ::= "(" Exp "," Exp ")" ;
 coercions Exp 3 ;
 
-
-Conj.     Formula  ::= Formula "|" Formula1 ;
-Disj.     Formula1 ::= Formula1 "&" Formula2 ;
+Disj.     Formula  ::= Formula "|" Formula1 ;
+Conj.     Formula1 ::= Formula1 "&" Formula2 ;
 Neg.      Formula2 ::= "-" Formula2 ;
 Atom.     Formula2 ::= Name ;
 coercions Formula 2 ;
 
-
 -- Branches
 Branch.   Branch ::= AIdent [AIdent] "->" ExpWhere ;
 separator Branch ";" ;