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
12 changes: 10 additions & 2 deletions GAP-LEDGER.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ A kind with no rows is a site the generators watch and that nothing reached in
this run. It prints so that an empty class reads as a measurement rather than
as a class nobody looked at.

Generated from `meos-idl.json` at MobilityDB `c5174b8af15d3ef3f38c77ba60cbf5a5d99dd54c` by `tools/codegen.py`
Generated from `meos-idl.json` at MobilityDB `0bc5f54084207e4c0e48d2b55c7f6b9cbb944045` by `tools/codegen.py`
and `tools/objectgen.py`. Do not edit.

<!-- gap-ledger:begin flat surface -->

## The flat surface — `tools/codegen.py`

### parameter nullability — 4336
### parameter nullability — 4344

`shape.nullable` names the parameters a function accepts NULL for, and the catalog carries no field saying a parameter is required. A pointer parameter named in neither reaches the surface with its contract unstated: the wrapper takes it, and nothing says whether zero is an argument or a fault.

Expand Down Expand Up @@ -332,6 +332,10 @@ and `tools/objectgen.py`. Do not edit.
| always_overlaps_tgeo_tgeo | temp1, temp2 |
| always_overlaps_tnpoint_stbox | temp, box |
| always_overlaps_tnumber_tbox | temp, box |
| always_overlaps_tpcbox_tpcpatch | box, temp |
| always_overlaps_tpcbox_tpcpoint | box, temp |
| always_overlaps_tpcpatch_tpcbox | temp, box |
| always_overlaps_tpcpoint_tpcbox | temp, box |
| always_overlaps_tpose_stbox | temp, box |
| always_overlaps_tpose_tpose | temp1, temp2 |
| always_overlaps_trgeometry_stbox | temp, box |
Expand Down Expand Up @@ -957,6 +961,10 @@ and `tools/objectgen.py`. Do not edit.
| ever_overlaps_tgeo_tgeo | temp1, temp2 |
| ever_overlaps_tnpoint_stbox | temp, box |
| ever_overlaps_tnumber_tbox | temp, box |
| ever_overlaps_tpcbox_tpcpatch | box, temp |
| ever_overlaps_tpcbox_tpcpoint | box, temp |
| ever_overlaps_tpcpatch_tpcbox | temp, box |
| ever_overlaps_tpcpoint_tpcbox | temp, box |
| ever_overlaps_tpose_stbox | temp, box |
| ever_overlaps_tpose_tpose | temp1, temp2 |
| ever_overlaps_trgeometry_stbox | temp, box |
Expand Down
26 changes: 25 additions & 1 deletion MEOS.NET/Functions/Meos.Native.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12245,6 +12245,18 @@ private static partial class Native
[LibraryImport(DllPath, EntryPoint = "always_ne_tpcpoint_tpcpoint", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysNeTpcpointTpcpoint(IntPtr temp1, IntPtr temp2);

[LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcbox_tpcpoint", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int EverOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp);

[LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcpoint_tpcbox", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int EverOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box);

[LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcbox_tpcpoint", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp);

[LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcpoint_tpcbox", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box);

[LibraryImport(DllPath, EntryPoint = "ever_eq_pcpatch_tpcpatch", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int EverEqPcpatchTpcpatch(IntPtr pa, IntPtr temp);

Expand Down Expand Up @@ -12281,6 +12293,18 @@ private static partial class Native
[LibraryImport(DllPath, EntryPoint = "always_ne_tpcpatch_tpcpatch", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysNeTpcpatchTpcpatch(IntPtr temp1, IntPtr temp2);

[LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcbox_tpcpatch", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int EverOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp);

[LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcpatch_tpcbox", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int EverOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box);

[LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcbox_tpcpatch", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp);

[LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcpatch_tpcbox", StringMarshalling = StringMarshalling.Utf8)]
internal static partial int AlwaysOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box);

[LibraryImport(DllPath, EntryPoint = "teq_pcpoint_tpcpoint", StringMarshalling = StringMarshalling.Utf8)]
internal static partial IntPtr TeqPcpointTpcpoint(IntPtr pt, IntPtr temp);

Expand Down Expand Up @@ -14172,7 +14196,7 @@ private static partial class Native
internal static partial IntPtr TrgeometryFromMfjson(string mfjson);

[LibraryImport(DllPath, EntryPoint = "trgeometry_out", StringMarshalling = StringMarshalling.Utf8)]
internal static partial IntPtr TrgeometryOut(IntPtr temp, out nuint size_out);
internal static partial IntPtr TrgeometryOut(IntPtr temp, int maxdd, out nuint size_out);

[LibraryImport(DllPath, EntryPoint = "trgeometry_as_text", StringMarshalling = StringMarshalling.Utf8)]
internal static partial IntPtr TrgeometryAsText(IntPtr temp, int maxdd, out nuint size_out);
Expand Down
24 changes: 24 additions & 0 deletions MEOS.NET/Functions/Meos.meos_pointcloud.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,18 @@ public static int AlwaysNeTpcpointPcpoint(IntPtr temp, IntPtr pt)
public static int AlwaysNeTpcpointTpcpoint(IntPtr temp1, IntPtr temp2)
=> SafeExecution<int>(() => Native.AlwaysNeTpcpointTpcpoint(temp1, temp2));

public static int EverOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp)
=> SafeExecution<int>(() => Native.EverOverlapsTpcboxTpcpoint(box, temp));

public static int EverOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box)
=> SafeExecution<int>(() => Native.EverOverlapsTpcpointTpcbox(temp, box));

public static int AlwaysOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp)
=> SafeExecution<int>(() => Native.AlwaysOverlapsTpcboxTpcpoint(box, temp));

public static int AlwaysOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box)
=> SafeExecution<int>(() => Native.AlwaysOverlapsTpcpointTpcbox(temp, box));

public static int EverEqPcpatchTpcpatch(IntPtr pa, IntPtr temp)
=> SafeExecution<int>(() => Native.EverEqPcpatchTpcpatch(pa, temp));

Expand Down Expand Up @@ -932,6 +944,18 @@ public static int AlwaysNeTpcpatchPcpatch(IntPtr temp, IntPtr pa)
public static int AlwaysNeTpcpatchTpcpatch(IntPtr temp1, IntPtr temp2)
=> SafeExecution<int>(() => Native.AlwaysNeTpcpatchTpcpatch(temp1, temp2));

public static int EverOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp)
=> SafeExecution<int>(() => Native.EverOverlapsTpcboxTpcpatch(box, temp));

public static int EverOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box)
=> SafeExecution<int>(() => Native.EverOverlapsTpcpatchTpcbox(temp, box));

public static int AlwaysOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp)
=> SafeExecution<int>(() => Native.AlwaysOverlapsTpcboxTpcpatch(box, temp));

public static int AlwaysOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box)
=> SafeExecution<int>(() => Native.AlwaysOverlapsTpcpatchTpcbox(temp, box));

public static IntPtr TeqPcpointTpcpoint(IntPtr pt, IntPtr temp)
=> SafeExecution<IntPtr>(() => Native.TeqPcpointTpcpoint(pt, temp));

Expand Down
4 changes: 2 additions & 2 deletions MEOS.NET/Functions/Meos.meos_rgeo.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ public static IntPtr TrgeometryIn(string str)
public static IntPtr TrgeometryFromMfjson(string mfjson)
=> SafeExecution<IntPtr>(() => Native.TrgeometryFromMfjson(mfjson));

public static string TrgeometryOut(IntPtr temp)
public static string TrgeometryOut(IntPtr temp, int maxdd)
{
nuint _size = 0;
IntPtr _p = SafeExecution<IntPtr>(() => Native.TrgeometryOut(temp, out _size));
IntPtr _p = SafeExecution<IntPtr>(() => Native.TrgeometryOut(temp, maxdd, out _size));
if (_p == IntPtr.Zero)
{
return null!;
Expand Down
10 changes: 2 additions & 8 deletions MEOS.NET/Types/PCPatch.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal PCPatch(IntPtr ptr) : base(ptr) { }

/// <summary>The text MEOS writes this value as.</summary>
public override string ToString()
=> this.HexOut(15);
=> this.AsText(15);

public int AlwaysEq(TPCPatch temp)
=> Meos.AlwaysEqPcpatchTpcpatch(this.Ptr, temp.Ptr);
Expand All @@ -28,7 +28,7 @@ public string AsHexWKB()
=> Meos.PcpatchAsHexwkb(this.Ptr);

public string AsText(int maxdd)
=> this.HexOut(maxdd);
=> Meos.PcpatchHexOut(this.Ptr, maxdd);

public int Cmp(PCPatch pa2)
=> Meos.PcpatchCmp(this.Ptr, pa2.Ptr);
Expand Down Expand Up @@ -63,9 +63,6 @@ public uint Hash()
public ulong HashExtended(ulong seed)
=> Meos.PcpatchHashExtended(this.Ptr, seed);

public string HexOut(int maxdd)
=> Meos.PcpatchHexOut(this.Ptr, maxdd);

public Set? Intersection(PCPatchSet s)
=> MEOSFactory.WrapSet(Meos.IntersectionPcpatchSet(this.Ptr, s.Ptr));

Expand Down Expand Up @@ -118,9 +115,6 @@ public uint Npoints()
=> MEOSFactory.WrapPCPatch(Meos.PcpatchFromHexwkb(hexwkb));

public static PCPatch? FromText(string str)
=> PCPatch.HexIn(str);

public static PCPatch? HexIn(string str)
=> MEOSFactory.WrapPCPatch(Meos.PcpatchHexIn(str));

public static PCPatch? Make(PCPoint[] points)
Expand Down
10 changes: 2 additions & 8 deletions MEOS.NET/Types/PCPoint.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal PCPoint(IntPtr ptr) : base(ptr) { }

/// <summary>The text MEOS writes this value as.</summary>
public override string ToString()
=> this.HexOut(15);
=> this.AsText(15);

public int AlwaysEq(TPCPoint temp)
=> Meos.AlwaysEqPcpointTpcpoint(this.Ptr, temp.Ptr);
Expand All @@ -28,7 +28,7 @@ public string AsHexWKB()
=> Meos.PcpointAsHexwkb(this.Ptr);

public string AsText(int maxdd)
=> this.HexOut(maxdd);
=> Meos.PcpointHexOut(this.Ptr, maxdd);

public int Cmp(PCPoint pt2)
=> Meos.PcpointCmp(this.Ptr, pt2.Ptr);
Expand Down Expand Up @@ -135,9 +135,6 @@ public uint Hash()
public ulong HashExtended(ulong seed)
=> Meos.PcpointHashExtended(this.Ptr, seed);

public string HexOut(int maxdd)
=> Meos.PcpointHexOut(this.Ptr, maxdd);

public Set? Intersection(PCPointSet s)
=> MEOSFactory.WrapSet(Meos.IntersectionPcpointSet(this.Ptr, s.Ptr));

Expand Down Expand Up @@ -175,9 +172,6 @@ public bool Ne(PCPoint pt2)
=> MEOSFactory.WrapPCPoint(Meos.PcpointFromHexwkb(hexwkb));

public static PCPoint? FromText(string str)
=> PCPoint.HexIn(str);

public static PCPoint? HexIn(string str)
=> MEOSFactory.WrapPCPoint(Meos.PcpointHexIn(str));

public static PCPoint? Make(uint pcid, double[] values)
Expand Down
12 changes: 12 additions & 0 deletions MEOS.NET/Types/TPCBox.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public bool After(TPCPatch temp)
public bool After(TPCPoint temp)
=> Meos.AfterTpcboxTpointcloud(this.Ptr, temp.Ptr);

public int AlwaysOverlaps(TPCPoint temp)
=> Meos.AlwaysOverlapsTpcboxTpcpoint(this.Ptr, temp.Ptr);

public int AlwaysOverlaps(TPCPatch temp)
=> Meos.AlwaysOverlapsTpcboxTpcpatch(this.Ptr, temp.Ptr);

public byte[]? AsEWKB(byte variant)
{
IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long));
Expand Down Expand Up @@ -177,6 +183,12 @@ public bool Contains(TPCPoint temp)
public bool Eq(TPCBox box2)
=> Meos.TpcboxEq(this.Ptr, box2.Ptr);

public int EverOverlaps(TPCPoint temp)
=> Meos.EverOverlapsTpcboxTpcpoint(this.Ptr, temp.Ptr);

public int EverOverlaps(TPCPatch temp)
=> Meos.EverOverlapsTpcboxTpcpatch(this.Ptr, temp.Ptr);

public bool Front(TPCBox box2)
=> Meos.FrontTpcboxTpcbox(this.Ptr, box2.Ptr);

Expand Down
6 changes: 6 additions & 0 deletions MEOS.NET/Types/TPCPatch.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public int AlwaysNe(PCPatch pa)
public int AlwaysNe(TPCPatch temp2)
=> Meos.AlwaysNeTpcpatchTpcpatch(this.Ptr, temp2.Ptr);

public int AlwaysOverlaps(TPCBox box)
=> Meos.AlwaysOverlapsTpcpatchTpcbox(this.Ptr, box.Ptr);

public Temporal? AtTpcbox(TPCBox box, bool border_inc)
=> MEOSFactory.WrapTemporal(Meos.TpcpatchAtTpcbox(this.Ptr, box.Ptr, border_inc));

Expand All @@ -54,6 +57,9 @@ public int EverNe(PCPatch pa)
public int EverNe(TPCPatch temp2)
=> Meos.EverNeTpcpatchTpcpatch(this.Ptr, temp2.Ptr);

public int EverOverlaps(TPCBox box)
=> Meos.EverOverlapsTpcpatchTpcbox(this.Ptr, box.Ptr);

public Temporal? MinusTpcbox(TPCBox box, bool border_inc)
=> MEOSFactory.WrapTemporal(Meos.TpcpatchMinusTpcbox(this.Ptr, box.Ptr, border_inc));

Expand Down
6 changes: 6 additions & 0 deletions MEOS.NET/Types/TPCPoint.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public int AlwaysNe(PCPoint pt)
public int AlwaysNe(TPCPoint temp2)
=> Meos.AlwaysNeTpcpointTpcpoint(this.Ptr, temp2.Ptr);

public int AlwaysOverlaps(TPCBox box)
=> Meos.AlwaysOverlapsTpcpointTpcbox(this.Ptr, box.Ptr);

public Temporal? AtTpcbox(TPCBox box, bool border_inc)
=> MEOSFactory.WrapTemporal(Meos.TpcpointAtTpcbox(this.Ptr, box.Ptr, border_inc));

Expand All @@ -54,6 +57,9 @@ public int EverNe(PCPoint pt)
public int EverNe(TPCPoint temp2)
=> Meos.EverNeTpcpointTpcpoint(this.Ptr, temp2.Ptr);

public int EverOverlaps(TPCBox box)
=> Meos.EverOverlapsTpcpointTpcbox(this.Ptr, box.Ptr);

public Temporal? MinusTpcbox(TPCBox box, bool border_inc)
=> MEOSFactory.WrapTemporal(Meos.TpcpointMinusTpcbox(this.Ptr, box.Ptr, border_inc));

Expand Down
8 changes: 5 additions & 3 deletions tools/objectgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -1616,9 +1616,11 @@ def portable_format(self, function: str) -> tuple[str, str] | None:
@staticmethod
def role_named(entry: dict) -> bool:
"""Whether the object model calls a method by its role, the reader or
writer of a type (ooName `in` or `out`), a name the object layer never
gives (rule 1 of the bindings in the I/O plan, MobilityDB #3353)."""
return entry["ooName"] in ("in", "out")
writer of a type (ooName `in`, `out`, or `hexIn` and `hexOut`, the
hex text of the point cloud types), a name the object layer never
gives (rule 1 of the bindings in the I/O plan, MobilityDB #3353), the
roles #take_portable_names of GoMEOS's tools/objectgen.py reads."""
return entry["ooName"] in ("in", "out", "hexIn", "hexOut")

def take_portable_names(self, cls: str, paired: list, entries: list) -> list:
"""Emit each reader or writer the object model calls by its role
Expand Down
Loading