* src/ltlparse/ltlscan.ll: Recognize && and ||.

* src/ltltest/parse.test, src/ltltest/parseerr.test,
src/ltltest/equals.test: Use these operators..

src/ltltest/equals.test

@@ -19,12 +19,12 @@ check 0 'G a ' ' G a'
 check 0 'a U b' 'a U b'
 check 0 'a & b' 'a & b'
 check 0 'a & b' 'b & a'
-check 0 'a & b & c' 'c & a & b'
+check 0 'a & b & c' 'c & a && b'
 check 0 'a & b & c' 'b & c & a'
-check 0 'a & b & a' 'b & a & b'
+check 0 'a && b & a' 'b & a & b'
 check 0 'a & b' 'b & a & b'
 check 0 'a & b' 'b & a & a'
-check 0 'a & b & (c |(f U g)| e)' 'b & a & a & (c | e |(f U g)| e | c) & b'
+check 0 'a & b & (c |(f U g)|| e)' 'b & a & a & (c | e |(f U g)| e | c) & b'
 
 # other formulae which are not
 check 1 'a' 'b'

src/ltltest/parse.test

@@ -20,6 +20,9 @@ for f in \
   'a + b' \
   'a3214 | b' \
   'a & b' \
+  'a && b' \
+  'a || b' \
+  'a | b' \
   '_a_ U b' \
   'a R b' \
   'a <=> b' \

src/ltltest/parseerr.test

@@ -39,6 +39,7 @@ check 'a U b V c R' ''
 # leading and trailing garbage are skipped
 check '/2/3/4/5 a + b /6/7/8/' 'multop(Or, AP(a), AP(b))'
 check 'a U b c' 'binop(U, AP(a), AP(b))'
+check 'a &&& b' 'AP(b)'
 # (check multop merging while we are at it)
 check 'a & b & c & d e' 'multop(And, AP(a), AP(b), AP(c), AP(d))'
 check 'a & (b | c) & d should work' 'multop(And, AP(a), multop(Or, AP(b), AP(c)), AP(d))'