Edit expr

diff --git a/src/Expr.agda b/src/Expr.agda
index 1cdf67c1f2e573b522e65bdf4ec281c307e50ae6..5f55c6e6bddd78c41c183512c29d2420a5760a84 100644 (file)
--- a/src/Expr.agda
+++ b/src/Expr.agda
@@ -3,13 +3,17 @@ module Expr where
 open import Variable
 
 
-data BinOp : Set where
-  -- Arithmetics
-  plus minus mult div power : BinOp
+data BinaryOp : Set where
+  -- Arithmetical
+  plus minus mult div power : BinaryOp
   -- Logical operations
-  and or : BinOp
+  equal and or : BinaryOp
+
+data UnaryOp : Set where
+  not : UnaryOp
 
 data Expr : Set where
   var : Variable → Expr
-  binary : BinOp → Expr → Expr → Expr
+  binary : BinaryOp → Expr → Expr → Expr
+  unary : UnaryOp → Expr → Expr
   constant : Value → Expr

diff --git a/src/Variable.agda b/src/Variable.agda
index f3b08cc1d4bc45bd97cbd53f5d877f33f52ab133..39628a81a15b1c1a965f052a3ae88f62bc173e48 100644 (file)
--- a/src/Variable.agda
+++ b/src/Variable.agda
@@ -14,6 +14,6 @@ data Value : Set where
   string : String → Value
   int : ℤ → Value
   bool : Bool → Value
-  double : ℤ × ℤ → Value
+  double : ℤ → ℤ → Value
   long : ℤ → Value
   void : Value