From e38c57560b79f995957b13a99514a90e1a5fc282 Mon Sep 17 00:00:00 2001
From: joewatt95 <joewatt95@u.nus.edu>
Date: Wed, 4 Oct 2023 13:43:02 +0800
Subject: [PATCH] new predef lib pred (#449)

* new predef lib pred

* update test cases
---
 lib/haskell/natural4/src/LS/XPile/LogicalEnglish/Pretty.hs | 7 +++++++
 .../test/Testcases/LogicalEnglish/date-time/actual.le      | 7 +++++++
 .../test/Testcases/LogicalEnglish/date-time/expected.le    | 7 +++++++
 .../Testcases/LogicalEnglish/ditto-with-spaces/actual.le   | 7 +++++++
 .../Testcases/LogicalEnglish/ditto-with-spaces/expected.le | 7 +++++++
 .../natural4/test/Testcases/LogicalEnglish/ditto/actual.le | 7 +++++++
 .../test/Testcases/LogicalEnglish/ditto/expected.le        | 7 +++++++
 .../actual.le                                              | 7 +++++++
 .../expected.le                                            | 7 +++++++
 .../LogicalEnglish/indentation-propn-databreach/actual.le  | 7 +++++++
 .../indentation-propn-databreach/expected.le               | 7 +++++++
 .../natural4/test/Testcases/LogicalEnglish/is-in/actual.le | 7 +++++++
 .../test/Testcases/LogicalEnglish/is-in/expected.le        | 7 +++++++
 .../Testcases/LogicalEnglish/is-max-terms-simple/actual.le | 7 +++++++
 .../LogicalEnglish/is-max-terms-simple/expected.le         | 7 +++++++
 .../Testcases/LogicalEnglish/is-min-terms-simple/actual.le | 7 +++++++
 .../LogicalEnglish/is-min-terms-simple/expected.le         | 7 +++++++
 .../Testcases/LogicalEnglish/is-not-diff-from/actual.le    | 7 +++++++
 .../Testcases/LogicalEnglish/is-not-diff-from/expected.le  | 7 +++++++
 .../test/Testcases/LogicalEnglish/is-num-simple/actual.le  | 7 +++++++
 .../Testcases/LogicalEnglish/is-num-simple/expected.le     | 7 +++++++
 .../LogicalEnglish/or-anaphora-with-ditto/actual.le        | 7 +++++++
 .../LogicalEnglish/or-anaphora-with-ditto/expected.le      | 7 +++++++
 .../Testcases/LogicalEnglish/product-twiceof/actual.le     | 7 +++++++
 .../Testcases/LogicalEnglish/product-twiceof/expected.le   | 7 +++++++
 .../test/Testcases/LogicalEnglish/rpc-rpeq-year/actual.le  | 7 +++++++
 .../Testcases/LogicalEnglish/rpc-rpeq-year/expected.le     | 7 +++++++
 .../LogicalEnglish/rpnary-is-max-x-where/actual.le         | 7 +++++++
 .../LogicalEnglish/rpnary-is-max-x-where/expected.le       | 7 +++++++
 .../LogicalEnglish/rpnary-is-min-x-where/actual.le         | 7 +++++++
 .../LogicalEnglish/rpnary-is-min-x-where/expected.le       | 7 +++++++
 .../Testcases/LogicalEnglish/sum-of-terms-simple/actual.le | 7 +++++++
 .../LogicalEnglish/sum-of-terms-simple/expected.le         | 7 +++++++
 .../template-regex-filters-out-subbed-phrases/actual.le    | 7 +++++++
 .../template-regex-filters-out-subbed-phrases/expected.le  | 7 +++++++
 .../template-regex-is-anchored-start-and-end/actual.le     | 7 +++++++
 .../template-regex-is-anchored-start-and-end/expected.le   | 7 +++++++
 .../Testcases/LogicalEnglish/vacuous-no-l4-rules/actual.le | 7 +++++++
 .../LogicalEnglish/vacuous-no-l4-rules/expected.le         | 7 +++++++
 39 files changed, 273 insertions(+)

diff --git a/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/Pretty.hs b/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/Pretty.hs
index ef157717e..fad55cd80 100644
--- a/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/Pretty.hs
+++ b/lib/haskell/natural4/src/LS/XPile/LogicalEnglish/Pretty.hs
@@ -288,6 +288,13 @@ libHCs =
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/actual.le
index eda7a56b6..014792d6a 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/expected.le
index eda7a56b6..014792d6a 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/date-time/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/actual.le
index 0ebb3ccea..4eab8db65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/expected.le
index 0ebb3ccea..4eab8db65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto-with-spaces/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/actual.le
index 0ebb3ccea..4eab8db65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/expected.le
index 0ebb3ccea..4eab8db65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/ditto/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/actual.le
index aa9d6909b..d32d7b1ab 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/actual.le
@@ -51,6 +51,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/expected.le
index aa9d6909b..d32d7b1ab 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/filtering-will-not-remove-all-nlas-in-eq-class/expected.le
@@ -51,6 +51,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/actual.le
index a1777990f..f044a959b 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/actual.le
@@ -53,6 +53,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/expected.le
index a1777990f..f044a959b 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/indentation-propn-databreach/expected.le
@@ -53,6 +53,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/actual.le
index f40603693..1ce572297 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/expected.le
index f40603693..1ce572297 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-in/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/actual.le
index ff88992f8..50aadc263 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/expected.le
index ff88992f8..50aadc263 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-max-terms-simple/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/actual.le
index cfa08034c..186a0ac17 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/expected.le
index cfa08034c..186a0ac17 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-min-terms-simple/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/actual.le
index 15c94a8f5..51ecbdcfd 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/actual.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/expected.le
index 15c94a8f5..51ecbdcfd 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-not-diff-from/expected.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/actual.le
index 88568fe60..9fbb99fa3 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/actual.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/expected.le
index 88568fe60..9fbb99fa3 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/is-num-simple/expected.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/actual.le
index 834451f41..bd15cf7c7 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/actual.le
@@ -53,6 +53,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/expected.le
index 834451f41..bd15cf7c7 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/or-anaphora-with-ditto/expected.le
@@ -53,6 +53,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/actual.le
index 469aff38a..5c595f3c6 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/expected.le
index 469aff38a..5c595f3c6 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/product-twiceof/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/actual.le
index e593419d7..1e900a9d7 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/expected.le
index e593419d7..1e900a9d7 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpc-rpeq-year/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/actual.le
index 02f072066..2bdce4b65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/actual.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/expected.le
index 02f072066..2bdce4b65 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-max-x-where/expected.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/actual.le
index 774140ee1..77a020eaa 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/actual.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/expected.le
index 774140ee1..77a020eaa 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/rpnary-is-min-x-where/expected.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/actual.le
index d1fff2403..65112a211 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/actual.le
@@ -51,6 +51,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/expected.le
index d1fff2403..65112a211 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/sum-of-terms-simple/expected.le
@@ -51,6 +51,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/actual.le
index 3f82f2c16..f339ef0c8 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/expected.le
index 3f82f2c16..f339ef0c8 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-filters-out-subbed-phrases/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/actual.le
index 171d93a68..105abee75 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/actual.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/expected.le
index 171d93a68..105abee75 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/template-regex-is-anchored-start-and-end/expected.le
@@ -50,6 +50,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/actual.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/actual.le
index cb6d23c62..d563bd768 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/actual.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/actual.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.
diff --git a/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/expected.le b/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/expected.le
index cb6d23c62..d563bd768 100644
--- a/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/expected.le
+++ b/lib/haskell/natural4/test/Testcases/LogicalEnglish/vacuous-no-l4-rules/expected.le
@@ -49,6 +49,13 @@ the knowledge base lib includes:
   if d1 is strictly before d0.
 
   % Nested accessor predicates.
+  a class's a field is a value
+  if field is different from name
+  and field is different from id
+  and a class0's name is class
+    or class0's id is class
+  and class0's field is value.
+
   a class's a field0's a field1 is a value
   if class's field0 is a class0
   and class0's field1 is value.