Merge branch 'develop'

Author: DavePearce

config.xml

@@ -1,4 +1,4 @@
 <project name="BuildConfig">
-  <property name="version" value="0.3.34"/>
+  <property name="version" value="0.4.3"/>
   <property name="WYBS_JAR" value="lib/wybs-v0.3.34.jar"/>
 </project>

examples/logic/Logic.wyrl

@@ -20,17 +20,21 @@ define Bool as True | False
 
 term Not(BExpr)
 
+@name("Not(Bool)")
 reduce Not(Bool b):
     => False, if b == True
     => True
 
+@name("Not(Not)")
 reduce Not(Not(* x)):
     => x
 
+@name("Not(And)")
 reduce Not(And{BExpr... xs}):
     => let ys = { Not(x) | x in xs }
        in Or(ys)
 
+@name("Not(Or)")
 reduce Not(Or{BExpr... xs}):
     => let ys = { Not(x) | x in xs }
        in And(ys)
@@ -41,20 +45,25 @@ reduce Not(Or{BExpr... xs}):
 
 term And{BExpr...}
 
+@name("And{x}")
 reduce And{BExpr x}:
     => x
 
+@name("And{Bool,...}")
 reduce And{Bool b, BExpr... xs}:
     => False, if b == False
     => True, if |xs| == 0
     => And (xs)
 
+@name("And{And,...}")
 reduce And{And{BExpr... xs}, BExpr... ys}:
     => And (xs ++ ys)
 
+@name("And{Not,...}")
 reduce And{Not(BExpr x), BExpr y, BExpr... ys}:
     => False, if x == y
 
+@name("And{Or,...}")
 reduce And{Or{BExpr... xs}, BExpr... ys}:
     => let ys = { And(x ++ ys) | x in xs }
        in Or(ys)
@@ -65,17 +74,21 @@ reduce And{Or{BExpr... xs}, BExpr... ys}:
 
 term Or{BExpr...}
 
+@name("Or{x}")
 reduce Or{BExpr x}:
     => x
 
+@name("Or{Bool,...}")
 reduce Or{Bool b, BExpr... xs}:
     => True, if b == True
     => False, if |xs| == 0
     => Or (xs)
 
+@name("Or{Not,...}")
 reduce Or{Not(BExpr x), BExpr y, BExpr... ys}:
     => True, if x == y
 
+@name("Or{Or,...}")
 reduce Or{Or{BExpr... xs}, BExpr... ys}:
     => Or (xs ++ ys)
 

examples/logic/Main.java

@@ -0,0 +1 @@
+And{Or{Not(False),Var("X")},And{True,Var("X")},Not(Var("X"))}