type mqstring =
| MQCons of string (* constant *)
| MQFunc of mqfunc * mqrvar (* function, rvar *)
- | MQRVar of mqrvar (* rvar *)
- | MQSVar of mqsvar (* svar *)
+ | MQSRVar of mqrvar (* rvar *)
+ | MQSSVar of mqsvar (* svar *)
| MQMConclusion (* main conclusion *)
| MQConclusion (* inner conclusion *)
| MQUnion of mqlist * mqlist (* operands *)
| MQIntersect of mqlist * mqlist (* operands *)
| MQSortedBy of mqlist * mqorder * mqfunc (* *)
- | MQRVarOccur of mqrvar
+ | MQLRVar of mqrvar
| MQDiff of mqlist * mqlist (* *)
type mquery =