this commit is out of control, started as preventing asserts against …

…expired states, became something different, plus clean up

listener/listener.go

@@ -1297,21 +1297,11 @@ func (l *FaultListener) ExitAssertion(c *parser.AssertionContext) {
 		}
 	case *ast.InfixExpression:
 
-		if e.Operator == "==" {
-			con = &ast.InvariantClause{
-				Token:    e.Token,
-				Left:     &ast.Boolean{Value: true},
-				Operator: "==",
-				Right:    e,
-			}
-		} else {
-
-			con = &ast.InvariantClause{
-				Token:    e.Token,
-				Left:     e.Left,
-				Operator: e.Operator,
-				Right:    e.Right,
-			}
+		con = &ast.InvariantClause{
+			Token:    e.Token,
+			Left:     e.Left,
+			Operator: e.Operator,
+			Right:    e.Right,
 		}
 	case *ast.InvariantClause:
 		con = e

preprocess/preprocess_test.go

@@ -452,7 +452,7 @@ func TestAsserts(t *testing.T) {
 		t.Fatalf("assumption var name 1 not correct got=%s", str1)
 	}
 
-	str1a := spec[4].(*ast.AssertionStatement).Constraint.Left.(ast.Nameable).RawId()
+	str1a := spec[4].(*ast.AssertionStatement).Constraint.Right.(*ast.InfixExpression).Left.(ast.Nameable).RawId()
 	if len(str1a) != 3 || str1a[0] != "test1" || str1a[1] != "foo" || str1a[2] != "bar" {
 		t.Fatalf("assumption var name 2 not correct got=%s", str1a)
 	}