ltltest: speedup more tests
This generalizes the previous patch. * src/ltltest/equalsf.cc: Allow escaped '\,' and negated result. * src/ltltest/Makefile.am: Use equalsf.cc for almost all tests that used equals.cc. (nequals): New. * src/ltltest/equals.test, src/ltltest/eventuniv.test, src/ltltest/lunabbrev.test, src/ltltest/nenoform.test, src/ltltest/parseerr.test, src/ltltest/tunabbrev.test, src/ltltest/tunenoform.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
7b9f695265
commit
6a741189bc
10 changed files with 371 additions and 324 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
|
||||
# Copyright (C) 2009, 2010, 2011, 2012, 2014 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
|
|
@ -25,181 +25,189 @@
|
|||
# Check for the equals visitor
|
||||
|
||||
. ./defs || exit 1
|
||||
set -e
|
||||
|
||||
cat >equal.txt <<\EOF
|
||||
# A few things which are equal
|
||||
run 0 ../equals 'a' 'a'
|
||||
run 0 ../equals '~a' '!a'
|
||||
run 0 ../equals '1' '1'
|
||||
run 0 ../equals '0' '0'
|
||||
run 0 ../equals 'a => b' 'a --> b'
|
||||
run 0 ../equals 'a <-> b' 'a <--> b'
|
||||
run 0 ../equals 'G a ' ' G a'
|
||||
run 0 ../equals 'a U b' 'a U b'
|
||||
run 0 ../equals 'a & b' 'a & b'
|
||||
run 0 ../equals 'a & b' 'b & a'
|
||||
run 0 ../equals 'a & b & c' 'c & a && b'
|
||||
run 0 ../equals 'a & b & c' 'b & c & a'
|
||||
run 0 ../equals 'a && b & a' 'b & a & b'
|
||||
run 0 ../equals 'a & b' 'b & a & b'
|
||||
run 0 ../equals 'a & b' 'b & a & a'
|
||||
run 0 ../equals 'a & b & (c |(f U g)|| e)' \
|
||||
'b & a & a & (c | e |(f U g)| e | c) & b'
|
||||
run 0 ../equals 'a & a' 'a'
|
||||
run 0 ../equals 'a & a & true' 'a'
|
||||
run 0 ../equals 'a & false & a' 'false'
|
||||
run 0 ../equals 'a | false | a' 'a'
|
||||
run 0 ../equals 'true | a | a' 'true'
|
||||
run 0 ../equals 'Ga=1*Gb=0' '(G(a)) & (G(!b))'
|
||||
|
||||
# other formulae which are not
|
||||
run 1 ../equals 'a' 'b'
|
||||
run 1 ../equals '1' '0'
|
||||
run 1 ../equals 'a => b' 'b => a'
|
||||
run 1 ../equals 'a => b' 'a <=> b'
|
||||
run 1 ../equals 'a => b' 'a U b'
|
||||
run 1 ../equals 'a R b' 'a U b'
|
||||
run 1 ../equals 'a & b & c' 'c & a'
|
||||
run 1 ../equals 'b & c' 'c & a & b'
|
||||
run 1 ../equals 'a & b & (c |(f U g)| e)' \
|
||||
'b & a & a & (c | e |(g U g)| e | c) & b'
|
||||
run 1 ../equals '{a*}' '{a*}<>->1'
|
||||
run 1 ../equals '!{a*}' '{a*}<>->1'
|
||||
run 1 ../equals '{a*}' '{a*}!'
|
||||
run 1 ../equals '!{a*}' '{a*}!'
|
||||
|
||||
a, a
|
||||
~a, !a
|
||||
1, 1
|
||||
0, 0
|
||||
a => b, a --> b
|
||||
a <-> b, a <--> b
|
||||
G a , G a
|
||||
a U b, a U b
|
||||
a & b, a & b
|
||||
a & b, b & a
|
||||
a & b & c, c & a && b
|
||||
a & b & c, b & c & a
|
||||
a && b & a, b & a & b
|
||||
a & b, b & a & b
|
||||
a & b, b & a & a
|
||||
a & b & (c |(f U g)|| e), b & a & a & (c | e |(f U g)| e | c) & b
|
||||
a & a, a
|
||||
a & a & true, a
|
||||
a & false & a, false
|
||||
a | false | a, a
|
||||
true | a | a, true
|
||||
Ga=1*Gb=0, (G(a)) & (G(!b))
|
||||
FFx, Fx
|
||||
FFFFFx, Fx
|
||||
GGx, Gx
|
||||
GGGGGx, Gx
|
||||
!!x, x
|
||||
!!!!!x, !x
|
||||
{[*0];x}<>->1, {x}<>->1
|
||||
{x;[*0]}<>->1, {x}<>-> 1
|
||||
{[*0];x;[*0];[*0]}<>->1, {x}<>->1
|
||||
{[*0];x;[*0];x;[*0]}<>->1, {x;x}<>->1
|
||||
{x;x;x;[*0];x;x}<>->1, {x;x;x;x;x}<>->1
|
||||
{x;0;x;x;x}<>->1, 0
|
||||
{x;0;x;x;x}[]->1, 1
|
||||
{0*;1}<>->x, x
|
||||
{[*0]*;1}<>->x, x
|
||||
{x;x}<>->FF(0), 0
|
||||
{x;x}<>->GX(1), {x;x}<>->1
|
||||
{x;x}[]->GX(1), 1
|
||||
{x;x}[]->FF(0), {x;x}[]->0
|
||||
{x;x}[]->y, {x;x}|->y
|
||||
{x;x}[]->y, {x;x}(y)
|
||||
{a*}!, {a*}<>->1
|
||||
{a -> b} (c), !(a->b)|c
|
||||
{a & !b}!, a & !b
|
||||
{a;[*0]}|->!Xb, !a | !Xb
|
||||
{{a;b}:b:c:d*:e:f}!, {{a;b}:{b && c }:d[*]:{e && f}}!
|
||||
{a:b:c}|->!Xb, !(a&&b&&c) | !Xb
|
||||
{a:b:c*}|->!Xb, {(a&&b):c*}|-> !Xb
|
||||
{a&b&c*}|->!Xb, {(a&&b)&c*}|-> !Xb
|
||||
{[*]&&a&&[*]}!, a
|
||||
{[*]||a||[*]}!, {[*]}!
|
||||
{0&{f;g*}}!, 0
|
||||
{1&{f;g*}}!, {f;g*}!
|
||||
# Precedence
|
||||
run 0 ../equals 'a & b ^ c | d' 'd | c ^ b & a'
|
||||
a & b ^ c | d, d | c ^ b & a
|
||||
|
||||
# Corner cases parsing
|
||||
run 0 ../equals 'FFG__GFF' 'F(F(G("__GFF")))'
|
||||
FFG__GFF, F(F(G("__GFF")))
|
||||
|
||||
# Trivial simplifications
|
||||
run 0 ../equals '{0*}<>->a' '{[*0]}<>->a'
|
||||
run 0 ../equals '{[*0]*}<>->a' '{[*0]}<>->a'
|
||||
run 0 ../equals '{Exp**}<>->a' '{Exp*}<>->a'
|
||||
run 0 ../equals 'FF(Exp)' 'F(Exp)'
|
||||
run 0 ../equals 'GG(Exp)' 'G(Exp)'
|
||||
run 0 ../equals 'F(0)' '0'
|
||||
run 0 ../equals 'G(0)' '0'
|
||||
run 0 ../equals 'F(1)' '1'
|
||||
run 0 ../equals 'G(1)' '1'
|
||||
run 0 ../equals 'F({[*0]}<>->1)' 'F({[*0]}<>->1)'
|
||||
run 0 ../equals 'G({[*0]}<>->1)' 'G({[*0]}<>->1)'
|
||||
run 0 ../equals 'F({1}<>->1)' '1'
|
||||
run 0 ../equals 'G({1}<>->1)' '1'
|
||||
run 0 ../equals '!1' '0'
|
||||
run 0 ../equals '!0' '1'
|
||||
run 0 ../equals '!!Exp' 'Exp'
|
||||
{0*}<>->a, {[*0]}<>->a
|
||||
{[*0]*}<>->a, {[*0]}<>->a
|
||||
{Exp**}<>->a, {Exp*}<>->a
|
||||
FF(Exp), F(Exp)
|
||||
GG(Exp), G(Exp)
|
||||
F(0), 0
|
||||
G(0), 0
|
||||
F(1), 1
|
||||
G(1), 1
|
||||
F({[*0]}<>->1), F({[*0]}<>->1)
|
||||
G({[*0]}<>->1), G({[*0]}<>->1)
|
||||
F({1}<>->1), 1
|
||||
G({1}<>->1), 1
|
||||
!1, 0
|
||||
!0, 1
|
||||
!!Exp, Exp
|
||||
|
||||
run 0 ../equals '(1 => Exp)' 'Exp'
|
||||
run 0 ../equals '(0 => Exp)' '1'
|
||||
run 0 ../equals '(Exp => 1)' '1'
|
||||
run 0 ../equals '(Exp => 0)' '!Exp'
|
||||
run 0 ../equals '(Exp => Exp)' '1'
|
||||
run 0 ../equals '(1 ^ Exp)' '!Exp'
|
||||
run 0 ../equals '(0 ^ Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp ^ Exp)' '0'
|
||||
run 0 ../equals '(0 <=> Exp)' '!Exp'
|
||||
run 0 ../equals '(1 <=> Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp <=> Exp)' '1'
|
||||
run 0 ../equals '(Exp U 1)' '1'
|
||||
run 0 ../equals '(Exp U 0)' '0'
|
||||
run 0 ../equals '(0 U Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp U Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp R 1)' '1'
|
||||
run 0 ../equals '(Exp R 0)' '0'
|
||||
run 0 ../equals '(Exp R Exp)' 'Exp'
|
||||
run 0 ../equals '(1 R Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp W 1)' '1'
|
||||
run 0 ../equals '(0 W Exp)' 'Exp'
|
||||
run 0 ../equals '(1 W Exp)' '1'
|
||||
run 0 ../equals '(Exp W Exp)' 'Exp'
|
||||
run 0 ../equals '(Exp M 0)' '0'
|
||||
run 0 ../equals '(1 M Exp)' 'Exp'
|
||||
run 0 ../equals '(0 M Exp)' '0'
|
||||
run 0 ../equals '(Exp M Exp)' 'Exp'
|
||||
(1 => Exp), Exp
|
||||
(0 => Exp), 1
|
||||
(Exp => 1), 1
|
||||
(Exp => 0), !Exp
|
||||
(Exp => Exp), 1
|
||||
(1 ^ Exp), !Exp
|
||||
(0 ^ Exp), Exp
|
||||
(Exp ^ Exp), 0
|
||||
(0 <=> Exp), !Exp
|
||||
(1 <=> Exp), Exp
|
||||
(Exp <=> Exp), 1
|
||||
(Exp U 1), 1
|
||||
(Exp U 0), 0
|
||||
(0 U Exp), Exp
|
||||
(Exp U Exp), Exp
|
||||
(Exp R 1), 1
|
||||
(Exp R 0), 0
|
||||
(Exp R Exp), Exp
|
||||
(1 R Exp), Exp
|
||||
(Exp W 1), 1
|
||||
(0 W Exp), Exp
|
||||
(1 W Exp), 1
|
||||
(Exp W Exp), Exp
|
||||
(Exp M 0), 0
|
||||
(1 M Exp), Exp
|
||||
(0 M Exp), 0
|
||||
(Exp M Exp), Exp
|
||||
|
||||
{1:{a;b}:1:c*}!, {{a;b}:c*}!
|
||||
{c*:1:{a;b}:1}!, {c*:{a;b}}!
|
||||
|
||||
{z;a*;b*;*;c;d;*;b*;e;a*;*;b*}, {z;[*];c;d;[*];e;[*]}
|
||||
{((a;b)|[*0]);[*];c}!, {[*];c}!
|
||||
{a;a;a*;a;b;b[*];c[*2:3];c[*4:5]}, {a[*3..];b[+];c[*6..8]}
|
||||
|
||||
{a[*0]}, {[*0]}
|
||||
{a[*..]}, {a[*]}
|
||||
{a[*2..3][*4..5]}, {a[*8..15]}
|
||||
{a[*4..5][*2..3]}, {a[*4..5][*2..3]}
|
||||
{a[*2:3][*]}, {a[*2 to 3][*]}
|
||||
{a[*1..3][*]}, {a[*]}
|
||||
{a[*][*2..3]}, {a[*]}
|
||||
{a[*..3][*2]}, {a[*..6]}
|
||||
{a[*..3][*to2]}, {a[*:6]}
|
||||
{a[*..3][*2..$]}, {a[*]}
|
||||
{a[*..3][*2:]}, {a[*:inf]}
|
||||
{a[*1..]}, {a[+]}
|
||||
{a[*1]}, {a}
|
||||
{a[+][*1..3]}, {a[+]}
|
||||
{a[*1..3][+]}, {a[+]}
|
||||
{[*2][+]}, {[*2][+]}
|
||||
{[+][*2]}, {[*2..inf]}
|
||||
|
||||
{0[=2]}, 0
|
||||
{0[=2..]}, 0
|
||||
{0[=1..10]}, 0
|
||||
{0[=0]}, {[*]}
|
||||
{0[=0..10]}, {*}
|
||||
{0[=0..]}, {*}
|
||||
{1[=0]}, {[*0]}
|
||||
{1[=1..2]}, {[*1\,2]}
|
||||
{1[=..4]}, {1[*..4]}
|
||||
{b[=0]}, {(!b)[*]}
|
||||
{b[=0to$]}, {*}
|
||||
|
||||
{0[->10..100];b}, 0
|
||||
{0[->1..];b}, 0
|
||||
{0[->0\,100];b}, b
|
||||
{0[->0..$];b}, b
|
||||
!{1[->0];b}, !b
|
||||
{1[->10\,20];b}, {[*10..20];b}
|
||||
{1[->..];b}, {[*1..];b}
|
||||
{{a&!c}[->0];b}, b
|
||||
EOF
|
||||
|
||||
|
||||
cat >nequal.txt <<\EOF
|
||||
# other formulae which are not
|
||||
a, b
|
||||
1, 0
|
||||
a => b, b => a
|
||||
a => b, a <=> b
|
||||
a => b, a U b
|
||||
a R b, a U b
|
||||
a & b & c, c & a
|
||||
b & c, c & a & b
|
||||
a & b & (c |(f U g)| e), b & a & a & (c | e |(g U g)| e | c) & b
|
||||
{a*}, {a*}<>->1
|
||||
!{a*}, {a*}<>->1
|
||||
{a*}, {a*}!
|
||||
!{a*}, {a*}!
|
||||
|
||||
run 0 ../equals FFx Fx
|
||||
run 0 ../equals FFFFFx Fx
|
||||
run 0 ../equals GGx Gx
|
||||
run 0 ../equals GGGGGx Gx
|
||||
run 0 ../equals '!!x' x
|
||||
run 0 ../equals '!!!!!x' '!x'
|
||||
run 0 ../equals '{[*0];x}<>->1' '{x}<>->1'
|
||||
run 0 ../equals '{x;[*0]}<>->1' '{x}<>-> 1'
|
||||
run 0 ../equals '{[*0];x;[*0];[*0]}<>->1' '{x}<>->1'
|
||||
run 0 ../equals '{[*0];x;[*0];x;[*0]}<>->1' '{x;x}<>->1'
|
||||
run 0 ../equals '{x;x;x;[*0];x;x}<>->1' '{x;x;x;x;x}<>->1'
|
||||
run 0 ../equals '{x;0;x;x;x}<>->1' '0'
|
||||
run 0 ../equals '{x;0;x;x;x}[]->1' '1'
|
||||
run 0 ../equals '{0*;1}<>->x' 'x'
|
||||
run 0 ../equals '{[*0]*;1}<>->x' 'x'
|
||||
run 0 ../equals '{x;x}<>->FF(0)' '0'
|
||||
run 0 ../equals '{x;x}<>->GX(1)' '{x;x}<>->1'
|
||||
run 0 ../equals '{x;x}[]->GX(1)' '1'
|
||||
run 0 ../equals '{x;x}[]->FF(0)' '{x;x}[]->0'
|
||||
run 0 ../equals '{x;x}[]->y' '{x;x}|->y'
|
||||
run 0 ../equals '{x;x}[]->y' '{x;x}(y)'
|
||||
run 0 ../equals '{a*}!' '{a*}<>->1'
|
||||
run 0 ../equals '{a -> b} (c)' '!(a->b)|c'
|
||||
run 0 ../equals '{a & !b}!' 'a & !b'
|
||||
run 0 ../equals '{a;[*0]}|->!Xb' '!a | !Xb'
|
||||
run 0 ../equals '{{a;b}:b:c:d*:e:f}!' '{{a;b}:{b && c }:d[*]:{e && f}}!'
|
||||
run 0 ../equals '{a:b:c}|->!Xb' '!(a&&b&&c) | !Xb'
|
||||
run 0 ../equals '{a:b:c*}|->!Xb' '{(a&&b):c*}|-> !Xb'
|
||||
run 0 ../equals '{a&b&c*}|->!Xb' '{(a&&b)&c*}|-> !Xb'
|
||||
run 0 ../equals '{[*]&&a&&[*]}!' 'a'
|
||||
run 0 ../equals '{[*]||a||[*]}!' '{[*]}!'
|
||||
run 0 ../equals '{0&{f;g*}}!' '0'
|
||||
run 0 ../equals '{1&{f;g*}}!' '{f;g*}!'
|
||||
# 1 should not be removed in the following two formulae
|
||||
run 1 ../equals '{1&{g*}}!' '{g*}!'
|
||||
run 1 ../equals '{1|{b;c}}<>->a' '{b;c}<>->a'
|
||||
run 0 ../equals '{1:{a;b}:1:c*}!' '{{a;b}:c*}!'
|
||||
run 0 ../equals '{c*:1:{a;b}:1}!' '{c*:{a;b}}!'
|
||||
{1&{g*}}!, {g*}!
|
||||
{1|{b;c}}<>->a, {b;c}<>->a
|
||||
# make sure twin arguments are not reduced in Fusion.
|
||||
run 1 ../equals '{(a;!a)*:(a;!a)*:b}!' '{(a;!a)*:b}!'
|
||||
{(a;!a)*:(a;!a)*:b}!, {(a;!a)*:b}!
|
||||
# make sure 1:a* is not reduced to a*.
|
||||
run 1 ../equals '{(1:a*);b}!' '{a*;b}!'
|
||||
run 0 ../equals '{z;a*;b*;*;c;d;*;b*;e;a*;*;b*}' '{z;[*];c;d;[*];e;[*]}'
|
||||
run 0 ../equals '{((a;b)|[*0]);[*];c}!' '{[*];c}!'
|
||||
run 0 ../equals '{a;a;a*;a;b;b[*];c[*2:3];c[*4:5]}' '{a[*3..];b[+];c[*6..8]}'
|
||||
{(1:a*);b}!, {a*;b}!
|
||||
EOF
|
||||
|
||||
run 0 ../equals '{a[*0]}' '{[*0]}'
|
||||
run 0 ../equals '{a[*..]}' '{a[*]}'
|
||||
run 0 ../equals '{a[*2..3][*4..5]}' '{a[*8..15]}'
|
||||
run 0 ../equals '{a[*4..5][*2..3]}' '{a[*4..5][*2..3]}'
|
||||
run 0 ../equals '{a[*2:3][*]}' '{a[*2 to 3][*]}'
|
||||
run 0 ../equals '{a[*1..3][*]}' '{a[*]}'
|
||||
run 0 ../equals '{a[*][*2..3]}' '{a[*]}'
|
||||
run 0 ../equals '{a[*..3][*2]}' '{a[*..6]}'
|
||||
run 0 ../equals '{a[*..3][*to2]}' '{a[*:6]}'
|
||||
run 0 ../equals '{a[*..3][*2..$]}' '{a[*]}'
|
||||
run 0 ../equals '{a[*..3][*2:]}' '{a[*:inf]}'
|
||||
run 0 ../equals '{a[*1..]}' '{a[+]}'
|
||||
run 0 ../equals '{a[*1]}' '{a}'
|
||||
run 0 ../equals '{a[+][*1..3]}' '{a[+]}'
|
||||
run 0 ../equals '{a[*1..3][+]}' '{a[+]}'
|
||||
run 0 ../equals '{[*2][+]}' '{[*2][+]}'
|
||||
run 0 ../equals '{[+][*2]}' '{[*2..inf]}'
|
||||
|
||||
run 0 ../equals '{0[=2]}' '0'
|
||||
run 0 ../equals '{0[=2..]}' '0'
|
||||
run 0 ../equals '{0[=1..10]}' '0'
|
||||
run 0 ../equals '{0[=0]}' '{[*]}'
|
||||
run 0 ../equals '{0[=0..10]}' '{*}'
|
||||
run 0 ../equals '{0[=0..]}' '{*}'
|
||||
run 0 ../equals '{1[=0]}' '{[*0]}'
|
||||
run 0 ../equals '{1[=1..2]}' '{[*1,2]}'
|
||||
run 0 ../equals '{1[=..4]}' '{1[*..4]}'
|
||||
run 0 ../equals '{b[=0]}' '{(!b)[*]}'
|
||||
run 0 ../equals '{b[=0to$]}' '{*}'
|
||||
|
||||
run 0 ../equals '{0[->10..100];b}' '0'
|
||||
run 0 ../equals '{0[->1..];b}' '0'
|
||||
run 0 ../equals '{0[->0,100];b}' 'b'
|
||||
run 0 ../equals '{0[->0..$];b}' 'b'
|
||||
run 0 ../equals '!{1[->0];b}' '!b'
|
||||
run 0 ../equals '{1[->10,20];b}' '{[*10..20];b}'
|
||||
run 0 ../equals '{1[->..];b}' '{[*1..];b}'
|
||||
run 0 ../equals '{{a&!c}[->0];b}' 'b'
|
||||
run 0 ../equals equal.txt
|
||||
run 0 ../nequals nequal.txt
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue