Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/portable-aliases.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ lookups for codegen:

```json
"portableAliases": {
"byOperator": { "&&": "overlaps", "#=": "teq", "~=": "same", ... },
"byBareName": { "overlaps": "&&", "teq": "#=", "same": "~=", ... },
"bareNames": ["above", "adjacent", ..., "tdistance", "tge", "tne"],
"count": 29, "provenance": {...}, "scope": {...}, "notes": [...]
"byOperator": { "&&": "overlaps", "#=": "tEqual", "~=": "same", ... },
"byBareName": { "overlaps": "&&", "tEqual": "#=", "same": "~=", ... },
"bareNames": ["aEqual", "aGreaterEqual", ..., "tLessEqual", "tLessThan", "tNotEqual"],
"count": 41, "provenance": {...}, "scope": {...}, "notes": [...]
}
```

Expand Down
36 changes: 18 additions & 18 deletions meta/portable-aliases.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,28 +98,28 @@
}
],
"temporalComparison": [
{ "operator": "#=", "bareName": "tEq" },
{ "operator": "#<>", "bareName": "tNe" },
{ "operator": "#<", "bareName": "tLt" },
{ "operator": "#<=", "bareName": "tLe" },
{ "operator": "#>", "bareName": "tGt" },
{ "operator": "#>=", "bareName": "tGe" }
{ "operator": "#=", "bareName": "tEqual" },
{ "operator": "#<>", "bareName": "tNotEqual" },
{ "operator": "#<", "bareName": "tLessThan" },
{ "operator": "#<=", "bareName": "tLessEqual" },
{ "operator": "#>", "bareName": "tGreaterThan" },
{ "operator": "#>=", "bareName": "tGreaterEqual" }
],
"everComparison": [
{ "operator": "?=", "bareName": "eEq" },
{ "operator": "?<>", "bareName": "eNe" },
{ "operator": "?<", "bareName": "eLt" },
{ "operator": "?<=", "bareName": "eLe" },
{ "operator": "?>", "bareName": "eGt" },
{ "operator": "?>=", "bareName": "eGe" }
{ "operator": "?=", "bareName": "eEqual" },
{ "operator": "?<>", "bareName": "eNotEqual" },
{ "operator": "?<", "bareName": "eLessThan" },
{ "operator": "?<=", "bareName": "eLessEqual" },
{ "operator": "?>", "bareName": "eGreaterThan" },
{ "operator": "?>=", "bareName": "eGreaterEqual" }
],
"alwaysComparison": [
{ "operator": "%=", "bareName": "aEq" },
{ "operator": "%<>", "bareName": "aNe" },
{ "operator": "%<", "bareName": "aLt" },
{ "operator": "%<=", "bareName": "aLe" },
{ "operator": "%>", "bareName": "aGt" },
{ "operator": "%>=", "bareName": "aGe" }
{ "operator": "%=", "bareName": "aEqual" },
{ "operator": "%<>", "bareName": "aNotEqual" },
{ "operator": "%<", "bareName": "aLessThan" },
{ "operator": "%<=", "bareName": "aLessEqual" },
{ "operator": "%>", "bareName": "aGreaterThan" },
{ "operator": "%>=", "bareName": "aGreaterEqual" }
],
"distance": [
{
Expand Down
4 changes: 2 additions & 2 deletions tests/test_portable.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def test_known_mappings_verbatim(self):
for op, bn in [("&&", "overlaps"), ("@>", "contains"),
("-|-", "adjacent"), ("<<#", "before"),
("#&>", "overafter"), ("|&>", "overabove"),
("/&>", "overback"), ("#=", "tEq"), ("#<>", "tNe"),
("?=", "eEq"), ("%=", "aEq"),
("/&>", "overback"), ("#=", "tEqual"),
("#<>", "tNotEqual"), ("?=", "eEqual"), ("%=", "aEqual"),
("|=|", "nearestApproachDistance"), ("~=", "same")]:
self.assertEqual(flat[op], bn)
self.assertEqual(sum(_EXPECTED_FAMILY_SIZES.values()), 41)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_portable_parity.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_backed_vs_needs_explicit(self):
self.assertEqual(nad["via"], "explicit")
self.assertNotIn("nearestApproachDistance", r["unbacked"])
self.assertEqual(r["byBareName"]["overlaps"]["family"], "topology")
self.assertEqual(r["byBareName"]["tEq"]["operator"], "#=")
self.assertEqual(r["byBareName"]["tEqual"]["operator"], "#=")

def test_every_bare_name_classified(self):
r = build_parity(_catalog([])) # nothing backs anything
Expand Down
Loading