Commit 99b99b0a authored by Andrei Paskevich's avatar Andrei Paskevich

replace "logic" with "function" and "predicate" in drivers

parent aa2c430e
......@@ -30,25 +30,26 @@ transformation "simplify_formula"
theory BuiltIn
syntax type int "int"
syntax type real "real"
syntax logic (=) "(%1 = %2)"
syntax predicate (=) "(%1 = %2)"
end
theory int.Int
prelude "(* this is a prelude for Alt-Ergo integer arithmetic *)"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (-_) "(-%1)"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (-_) "(-%1)"
syntax logic (<=) "(%1 <= %2)"
syntax logic (<) "(%1 < %2)"
syntax logic (>=) "(%1 >= %2)"
syntax logic (>) "(%1 > %2)"
syntax predicate (<=) "(%1 <= %2)"
syntax predicate (<) "(%1 < %2)"
syntax predicate (>=) "(%1 >= %2)"
syntax predicate (>) "(%1 > %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -69,8 +70,8 @@ end
theory int.EuclideanDivision
syntax logic div "(%1 / %2)"
syntax logic mod "(%1 % %2)"
syntax function div "(%1 / %2)"
syntax function mod "(%1 % %2)"
end
......@@ -79,20 +80,20 @@ theory real.Real
prelude "(* this is a prelude for Alt-Ergo real arithmetic *)"
syntax logic zero "0.0"
syntax logic one "1.0"
syntax function zero "0.0"
syntax function one "1.0"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (/) "(%1 / %2)"
syntax logic (-_) "(-%1)"
syntax logic inv "(1.0 / %1)"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (/) "(%1 / %2)"
syntax function (-_) "(-%1)"
syntax function inv "(1.0 / %1)"
syntax logic (<=) "(%1 <= %2)"
syntax logic (<) "(%1 < %2)"
syntax logic (>=) "(%1 >= %2)"
syntax logic (>) "(%1 > %2)"
syntax predicate (<=) "(%1 <= %2)"
syntax predicate (<) "(%1 < %2)"
syntax predicate (>=) "(%1 >= %2)"
syntax predicate (>) "(%1 > %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -114,32 +115,32 @@ end
theory real.RealInfix
syntax logic (+.) "(%1 + %2)"
syntax logic (-.) "(%1 - %2)"
syntax logic ( *.) "(%1 * %2)"
syntax logic (/.) "(%1 / %2)"
syntax logic (-._) "(-%1)"
syntax function (+.) "(%1 + %2)"
syntax function (-.) "(%1 - %2)"
syntax function ( *.) "(%1 * %2)"
syntax function (/.) "(%1 / %2)"
syntax function (-._) "(-%1)"
syntax logic (<=.) "(%1 <= %2)"
syntax logic (<.) "(%1 < %2)"
syntax logic (>=.) "(%1 >= %2)"
syntax logic (>.) "(%1 > %2)"
syntax predicate (<=.) "(%1 <= %2)"
syntax predicate (<.) "(%1 < %2)"
syntax predicate (>=.) "(%1 >= %2)"
syntax predicate (>.) "(%1 > %2)"
end
theory bool.Bool
syntax type bool "bool"
syntax logic True "true"
syntax logic False "false"
syntax type bool "bool"
syntax function True "true"
syntax function False "false"
end
theory Tuple0
syntax type tuple0 "unit"
syntax logic Tuple0 "void"
syntax type tuple0 "unit"
syntax function Tuple0 "void"
end
theory algebra.AC
meta cloned AC logic op
meta cloned AC function op
remove cloned prop Comm.Comm
remove cloned prop Assoc.Assoc
end
......
......@@ -25,7 +25,8 @@ transformation "encoding_smt"
theory BuiltIn
syntax type int "Int"
syntax type real "Real"
syntax logic (=) "(= %1 %2)"
syntax predicate (=) "(= %1 %2)"
meta "encoding : kept" type int
end
......@@ -34,18 +35,18 @@ theory int.Int
prelude ";;; this is a prelude for Alt-Ergo integer arithmetic"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax logic (+) "(+ %1 %2)"
syntax logic (-) "(- %1 %2)"
syntax logic (*) "(* %1 %2)"
syntax logic (-_) "(- %1)"
syntax function (+) "(+ %1 %2)"
syntax function (-) "(- %1 %2)"
syntax function (*) "(* %1 %2)"
syntax function (-_) "(- %1)"
syntax logic (<=) "(<= %1 %2)"
syntax logic (<) "(< %1 %2)"
syntax logic (>=) "(>= %1 %2)"
syntax logic (>) "(> %1 %2)"
syntax predicate (<=) "(<= %1 %2)"
syntax predicate (<) "(< %1 %2)"
syntax predicate (>=) "(>= %1 %2)"
syntax predicate (>) "(> %1 %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -66,8 +67,8 @@ end
theory int.EuclideanDivision
syntax logic div "(div %1 %2)"
syntax logic mod "(mod %1 %2)"
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
end
......@@ -75,20 +76,20 @@ theory real.Real
prelude ";;; this is a prelude for Alt-Ergo real arithmetic"
syntax logic zero "0.0"
syntax logic one "1.0"
syntax function zero "0.0"
syntax function one "1.0"
syntax logic (+) "(+ %1 %2)"
syntax logic (-) "(- %1 %2)"
syntax logic (*) "(* %1 %2)"
syntax logic (/) "(/ %1 %2)"
syntax logic (-_) "(- %1)"
syntax logic inv "(/ 1.0 %1)"
syntax function (+) "(+ %1 %2)"
syntax function (-) "(- %1 %2)"
syntax function (*) "(* %1 %2)"
syntax function (/) "(/ %1 %2)"
syntax function (-_) "(- %1)"
syntax function inv "(/ 1.0 %1)"
syntax logic (<=) "(<= %1 %2)"
syntax logic (<) "(< %1 %2)"
syntax logic (>=) "(>= %1 %2)"
syntax logic (>) "(> %1 %2)"
syntax predicate (<=) "(<= %1 %2)"
syntax predicate (<) "(< %1 %2)"
syntax predicate (>=) "(>= %1 %2)"
syntax predicate (>) "(> %1 %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......
......@@ -2,8 +2,9 @@ import "alt_ergo.drv"
theory map.Map
syntax type map "(%1,%2) farray"
syntax logic get "(%1[%2])"
syntax logic set "(%1[%2 <- %3])"
syntax function get "(%1[%2])"
syntax function set "(%1[%2 <- %3])"
end
(*
......
......@@ -30,38 +30,38 @@ theory BuiltIn
syntax type int "Z"
syntax type real "R"
syntax logic (=) "(%1 = %2)"
syntax predicate (=) "(%1 = %2)"
end
theory bool.Bool
syntax type bool "bool"
syntax logic True "true"
syntax logic False "false"
syntax function True "true"
syntax function False "false"
syntax logic andb "(andb %1 %2)"
syntax logic orb "(orb %1 %2)"
syntax logic xorb "(xorb %1 %2)"
syntax logic notb "(negb %1)"
syntax function andb "(andb %1 %2)"
syntax function orb "(orb %1 %2)"
syntax function xorb "(xorb %1 %2)"
syntax function notb "(negb %1)"
end
theory int.Int
syntax logic zero "0%Z"
syntax logic one "1%Z"
syntax function zero "0%Z"
syntax function one "1%Z"
syntax logic (+) "(%1 + %2)%Z"
syntax logic (-) "(%1 - %2)%Z"
syntax logic (*) "(%1 * %2)%Z"
syntax logic (-_) "(-%1)%Z"
syntax function (+) "(%1 + %2)%Z"
syntax function (-) "(%1 - %2)%Z"
syntax function (*) "(%1 * %2)%Z"
syntax function (-_) "(-%1)%Z"
syntax logic (<=) "(%1 <= %2)%Z"
syntax logic (<) "(%1 < %2)%Z"
syntax logic (>=) "(%1 >= %2)%Z"
syntax logic (>) "(%1 > %2)%Z"
syntax predicate (<=) "(%1 <= %2)%Z"
syntax predicate (<) "(%1 < %2)%Z"
syntax predicate (>=) "(%1 >= %2)%Z"
syntax predicate (>) "(%1 > %2)%Z"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -83,14 +83,14 @@ end
theory int.Abs
syntax logic abs "(Zabs %1)"
syntax function abs "(Zabs %1)"
end
theory int.MinMax
syntax logic min "(Zmin %1 %2)"
syntax logic max "(Zmax %1 %2)"
syntax function min "(Zmin %1 %2)"
syntax function max "(Zmax %1 %2)"
end
......@@ -98,8 +98,8 @@ theory int.EuclideanDivision
prelude "Require Import Zdiv."
syntax logic div "(Zdiv %1 %2)"
syntax logic mod "(Zmod %1 %2)"
syntax function div "(Zdiv %1 %2)"
syntax function mod "(Zmod %1 %2)"
end
......@@ -107,28 +107,28 @@ theory int.ComputerDivision
prelude "Require Import ZOdiv."
syntax logic div "(ZOdiv %1 %2)"
syntax logic mod "(ZOmod %1 %2)"
syntax function div "(ZOdiv %1 %2)"
syntax function mod "(ZOmod %1 %2)"
end
theory real.Real
syntax logic zero "0%R"
syntax logic one "1%R"
syntax function zero "0%R"
syntax function one "1%R"
syntax logic (+) "(%1 + %2)%R"
syntax logic (-) "(%1 - %2)%R"
syntax logic (-_) "(-%1)%R"
syntax logic (*) "(%1 * %2)%R"
syntax logic (/) "(Rdiv %1 %2)%R"
syntax logic inv "(Rinv %1)"
syntax function (+) "(%1 + %2)%R"
syntax function (-) "(%1 - %2)%R"
syntax function (-_) "(-%1)%R"
syntax function (*) "(%1 * %2)%R"
syntax function (/) "(Rdiv %1 %2)%R"
syntax function inv "(Rinv %1)"
syntax logic (<=) "(%1 <= %2)%R"
syntax logic (<) "(%1 < %2)%R"
syntax logic (>=) "(%1 >= %2)%R"
syntax logic (>) "(%1 > %2)%R"
syntax predicate (<=) "(%1 <= %2)%R"
syntax predicate (<) "(%1 < %2)%R"
syntax predicate (>=) "(%1 >= %2)%R"
syntax predicate (>) "(%1 > %2)%R"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -151,16 +151,16 @@ end
theory real.RealInfix
syntax logic (+.) "(%1 + %2)%R"
syntax logic (-.) "(%1 - %2)%R"
syntax logic (-._) "(-%1)%R"
syntax logic ( *.) "(%1 * %2)%R"
syntax logic (/.) "(%1 / %2)%R"
syntax function (+.) "(%1 + %2)%R"
syntax function (-.) "(%1 - %2)%R"
syntax function (-._) "(-%1)%R"
syntax function ( *.) "(%1 * %2)%R"
syntax function (/.) "(%1 / %2)%R"
syntax logic (<=.) "(%1 <= %2)%R"
syntax logic (<.) "(%1 < %2)%R"
syntax logic (>=.) "(%1 >= %2)%R"
syntax logic (>.) "(%1 > %2)%R"
syntax predicate (<=.) "(%1 <= %2)%R"
syntax predicate (<.) "(%1 < %2)%R"
syntax predicate (>=.) "(%1 >= %2)%R"
syntax predicate (>.) "(%1 > %2)%R"
end
......@@ -168,7 +168,7 @@ theory real.Abs
prelude "Require Import Rbasic_fun."
syntax logic abs "(Rabs %1)"
syntax function abs "(Rabs %1)"
remove prop Abs_pos
......@@ -176,7 +176,7 @@ end
theory real.FromInt
syntax logic from_int "(IZR %1)"
syntax function from_int "(IZR %1)"
end
......@@ -184,8 +184,8 @@ theory real.Square
prelude "Require Import R_sqrt."
syntax logic sqr "(Rsqr %1)"
syntax logic sqrt "(sqrt %1)" (* and not Rsqrt *)
syntax function sqr "(Rsqr %1)"
syntax function sqrt "(sqrt %1)" (* and not Rsqrt *)
end
......@@ -195,8 +195,8 @@ theory real.ExpLog
prelude "Require Import Rtrigo_def."
prelude "Require Import Rpower."
syntax logic exp "(exp %1)"
syntax logic log "(ln %1)"
syntax function exp "(exp %1)"
syntax function log "(ln %1)"
remove prop Exp_zero
remove prop Exp_sum
......@@ -220,12 +220,12 @@ theory real.Trigonometry
prelude "Require Import Rtrigo."
prelude "Require Import AltSeries. (* for def of pi *)"
syntax logic cos "(Rtrigo_def.cos %1)"
syntax logic sin "(Rtrigo_def.sin %1)"
syntax function cos "(Rtrigo_def.cos %1)"
syntax function sin "(Rtrigo_def.sin %1)"
syntax logic pi "PI"
syntax function pi "PI"
syntax logic tan "(Rtrigo.tan %1)"
(* syntax logic atan "atan not defined in Coq ?" *)
syntax function tan "(Rtrigo.tan %1)"
(* syntax function atan "atan not defined in Coq ?" *)
end
......@@ -27,7 +27,7 @@ transformation "encoding_smt"
theory BuiltIn
syntax type int "INT"
syntax type real "REAL"
syntax logic (=) "(%1 = %2)"
syntax predicate (=) "(%1 = %2)"
meta "encoding : kept" type int
end
......@@ -36,18 +36,18 @@ theory int.Int
prelude "%%% this is a prelude for CVC3 integer arithmetic"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (-_) "(- %1)"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (-_) "(- %1)"
syntax logic (<=) "(%1 <= %2)"
syntax logic (<) "(%1 < %2)"
syntax logic (>=) "(%1 >= %2)"
syntax logic (>) "(%1 > %2)"
syntax predicate (<=) "(%1 <= %2)"
syntax predicate (<) "(%1 < %2)"
syntax predicate (>=) "(%1 >= %2)"
syntax predicate (>) "(%1 > %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -71,21 +71,20 @@ theory real.Real
prelude "%%% this is a prelude for CVC3 real arithmetic"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (/) "(%1 / %2)"
syntax function (-_) "(- %1)"
syntax function inv "(1 / %1)"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (/) "(%1 / %2)"
syntax logic (-_) "(- %1)"
syntax logic inv "(1 / %1)"
syntax logic (<=) "(%1 <= %2)"
syntax logic (<) "(%1 < %2)"
syntax logic (>=) "(%1 >= %2)"
syntax logic (>) "(%1 > %2)"
syntax predicate (<=) "(%1 <= %2)"
syntax predicate (<) "(%1 < %2)"
syntax predicate (>=) "(%1 >= %2)"
syntax predicate (>) "(%1 > %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -111,20 +110,20 @@ end
(* L'encodage des types sommes bloquent cette théorie builtin *)
theory bool.Bool
syntax type bool "BITVECTOR(1)"
syntax logic True "0bin1"
syntax logic False "0bin0"
syntax logic andb "(%1 & %2)"
syntax logic orb "(%1 | %2)"
syntax logic xorb "(BVXOR(%1,%2))"
syntax logic notb "(~ %1)"
syntax function True "0bin1"
syntax function False "0bin0"
syntax function andb "(%1 & %2)"
syntax function orb "(%1 | %2)"
syntax function xorb "(BVXOR(%1,%2))"
syntax function notb "(~ %1)"
meta cloned "encoding_decorate : kept" type bool
end
*)
(*
theory int.EuclideanDivision
syntax logic div "(div %1 %2)"
syntax logic mod "(mod %1 %2)"
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
......@@ -135,11 +134,11 @@ end
theory map.Map
syntax type map "(ARRAY %1 OF %2)"
meta "encoding : lskept" logic get
meta "encoding : lskept" logic set
meta "encoding : lskept" function get
meta "encoding : lskept" function set
syntax logic get "(%1[%2])"
syntax logic set "(%1 WITH [%2] := %3)"
syntax function get "(%1[%2])"
syntax function set "(%1 WITH [%2] := %3)"
end
(*
......
......@@ -29,34 +29,34 @@ transformation "abstract_unknown_lsymbols"
theory BuiltIn
syntax type int "int"
syntax type real "real"
syntax logic (=) "dummy"
syntax predicate (=) "dummy"
end
theory int.Int
prelude "# this is a prelude for Gappa integer arithmetic"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (-_) "(-%1)"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (-_) "(-%1)"
syntax logic (<=) "dummy"
syntax logic (>=) "dummy"
syntax logic (<) "dummy"
syntax logic (>) "dummy"
syntax predicate (<=) "dummy"
syntax predicate (>=) "dummy"
syntax predicate (<) "dummy"
syntax predicate (>) "dummy"
meta "gappa arith" logic (<=), "", "<=", ">="
meta "gappa arith" logic (>=), "", ">=", "<="
meta "gappa arith" logic (<), "not ", ">=", "<="
meta "gappa arith" logic (>), "not ", "<=", ">="
meta "gappa arith" predicate (<=), "", "<=", ">="
meta "gappa arith" predicate (>=), "", ">=", "<="
meta "gappa arith" predicate (<), "not ", ">=", "<="
meta "gappa arith" predicate (>), "not ", "<=", ">="
meta "inline : no" logic (<=)
meta "inline : no" logic (>=)
meta "inline : no" logic (>)
meta "inline : no" predicate (<=)
meta "inline : no" predicate (>=)
meta "inline : no" predicate (>)
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -75,19 +75,19 @@ end
theory int.Abs
syntax logic abs "| %1 |"
syntax function abs "| %1 |"
end
theory int.EuclideanDivision
syntax logic div "int<dn>(%1 / %2)"
syntax function div "int<dn>(%1 / %2)"
end
theory int.ComputerDivision
syntax logic div "int<zr>(%1 / %2)"
syntax function div "int<zr>(%1 / %2)"
end
......@@ -95,29 +95,29 @@ theory real.Real
prelude "# this is a prelude for Gappa real arithmetic"
syntax logic zero "0.0"
syntax logic one "1.0"
syntax function zero "0.0"
syntax function one "1.0"
syntax logic (+) "(%1 + %2)"
syntax logic (-) "(%1 - %2)"
syntax logic (*) "(%1 * %2)"
syntax logic (/) "(%1 / %2)"
syntax logic (-_) "(-%1)"
syntax logic inv "(1.0 / %1)"
syntax function (+) "(%1 + %2)"
syntax function (-) "(%1 - %2)"
syntax function (*) "(%1 * %2)"
syntax function (/) "(%1 / %2)"
syntax function (-_) "(-%1)"
syntax function inv "(1.0 / %1)"
syntax logic (<=) "dummy"
syntax logic (>=) "dummy"
syntax logic (<) "dummy"
syntax logic (>) "dummy"
syntax predicate (<=) "dummy"
syntax predicate (>=) "dummy"
syntax predicate (<) "dummy"
syntax predicate (>) "dummy"
meta "gappa arith" logic (<=), "", "<=", ">="
meta "gappa arith" logic (>=), "", ">=", "<="
meta "gappa arith" logic (<), "not ", ">=", "<="
meta "gappa arith" logic (>), "not ", "<=", ">="
meta "gappa arith" predicate (<=), "", "<=", ">="
meta "gappa arith" predicate (>=), "", ">=", "<="
meta "gappa arith" predicate (<), "not ", ">=", "<="
meta "gappa arith" predicate (>), "not ", "<=", ">="
meta "inline : no" logic (<=)
meta "inline : no" logic (>=)
meta "inline : no" logic (>)
meta "inline : no" predicate (<=)
meta "inline : no" predicate (>=)
meta "inline : no" predicate (>)
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......@@ -137,49 +137,49 @@ end
theory real.Abs
syntax logic abs "| %1 |"
syntax function abs "| %1 |"
end
theory real.Square
syntax logic sqrt "sqrt(%1)"
syntax function sqrt "sqrt(%1)"
end
theory real.Truncate
syntax logic truncate "int<zr>(%1)"
syntax logic floor "int<dn>(%1)"
syntax logic ceil "int<up>(%1)"
syntax function truncate "int<zr>(%1)"
syntax function floor "int<dn>(%1)"
syntax function ceil "int<up>(%1)"
end
theory real.FromInt
syntax logic from_int "%1"
syntax function from_int "%1"
end
theory floating_point.Single
syntax logic round "float<ieee_32,%1>(%2)"
syntax function round "float<ieee_32,%1>(%2)"
end
theory floating_point.Double
syntax logic round "float<ieee_64,%1>(%2)"
syntax function round "float<ieee_64,%1>(%2)"
end
theory floating_point.Rounding
syntax logic NearestTiesToEven "ne"
syntax logic ToZero "zr"
syntax logic Up "up"
syntax logic Down "dn"
syntax logic NearTiesToAway "na"
syntax function NearestTiesToEven "ne"
syntax function ToZero "zr"
syntax function Up "up"
syntax function Down "dn"
syntax function NearTiesToAway "na"
end
......
......@@ -31,7 +31,7 @@ trigger they can't appear since = can't appear *)
transformation "encoding_tptp"
theory BuiltIn
syntax logic (=) "(EQ %1 %2)"
syntax predicate (=) "(EQ %1 %2)"
meta "enco_poly" "decorate"
meta "encoding : kept" type int
......@@ -42,18 +42,18 @@ theory int.Int
prelude ";;; this is a prelude for Simplify integer arithmetic"
syntax logic zero "0"
syntax logic one "1"
syntax function zero "0"
syntax function one "1"
syntax logic (+) "(+ %1 %2)"
syntax logic (-) "(- %1 %2)"
syntax logic (*) "(* %1 %2)"
syntax logic (-_) "(- 0 %1)"
syntax function (+) "(+ %1 %2)"
syntax function (-) "(- %1 %2)"
syntax function (*) "(* %1 %2)"
syntax function (-_) "(- 0 %1)"
syntax logic (<=) "(<= %1 %2)"
syntax logic (<) "(< %1 %2)"
syntax logic (>=) "(>= %1 %2)"
syntax logic (>) "(> %1 %2)"
syntax predicate (<=) "(<= %1 %2)"
syntax predicate (<) "(< %1 %2)"
syntax predicate (>=) "(>= %1 %2)"
syntax predicate (>) "(> %1 %2)"
remove prop CommutativeGroup.Comm.Comm
remove prop CommutativeGroup.Assoc.Assoc
......
......@@ -31,7 +31,7 @@ transformation "eliminate_let"
transformation "encoding_tptp"
theory BuiltIn
syntax logic (=) "(%1 = %2)"
syntax predicate (=) "(%1 = %2)"
end
(*
......
......@@ -31,7 +31,7 @@ transformation "eliminate_let"
transformation "encoding_tptp"
theory BuiltIn
syntax logic (=) "(%1 = %2)"
syntax predicate (=) "(%1 = %2)"