Add GIVEN * EXCEPT ... support

[KingMob]

No description provided.

[codecov]

Codecov Report

Attention: Patch coverage is 91.66667% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 75.91%. Comparing base (680e377) to head (62930fc).

Files	Patch %	Lines
src/inferenceql/query/permissive.cljc	91.66%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #103      +/-   ##
==========================================
+ Coverage   75.72%   75.91%   +0.18%     
==========================================
  Files          30       30              
  Lines        1516     1536      +20     
  Branches       65       66       +1     
==========================================
+ Hits         1148     1166      +18     
- Misses        303      304       +1     
- Partials       65       66       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[KingMob]

If people think this is overkill, I can change or remove it. (Only real consequence is spaces before commas when unparsing the converted perm->strict query. E.g., model GIVEN * EXCEPT foo AND bar AND moop -> model CONDITIONED BY * EXCEPT foo , bar , moop.)

I know it's ugly, but the need to look at pairs, and skip over input makes it awkward. I considered variations using partition, reduce, rest/butlast, etc. and none of them turned out cleaner. Too many fns aren't designed to skip input or work with more than one item at a time.

However, I was able to come up with a recursive core.match version, though, if people prefer that. Only down side is it's 50% slower.

(defn ands->commas2
  "Like the above, but uses core.match recursively to look at two items at a time."
  [node]
  (match/match [node]
    [([n1 n2 & more] :seq)]
    (if (and (tree/whitespace? n1)
             (string? n2)
             (re-matches #"(?i)AND" n2))
      (cons "," (ands->commas2 more))
      (cons n1 (ands->commas2 (cons n2 more))))

    :else node))

I also tried using into [] and vectors, but lists are faster for building piece-wise.

[zane]

Looks good!

[zane]

Intentional? Fine either way.

[KingMob]

The blank line? Uhh, don't recall. But with I do tend to add blank lines when the body of something has pairs of lines, like long conditionals in cond.