Changeset 1374 for fmts/trunk/p

Timestamp:

Mar 8, 2012, 7:01:36 PM (13 years ago)

Author:

George Lilly

Message:

working on pred and objects queries

File:

• fmts/trunk/p/C0XGET1.m (modified) (2 diffs)

fmts/trunk/p/C0XGET1.m

@@ -171 +171 @@
  s itbl("I000",ii)="d zip(.tmprtn,zt,zi)"
  s ii=$s(zw="S":"OSP",zw="P":"OPS",zw="O":"OSP") ; obj constraint
- s ix=$s(zw="O":"s tmprtn(zobj)=""""",1:"d zip1(.tmprtn,zt,zi,zobj)")
+ s ix=$s(zw="O":"d just(zobj)",1:"d zip1(.tmprtn,zt,zi,zobj)")
  s itbl("I001",ii)=ix
- s itbl("I010","PSO")="d zip1(.tmprtn,zt,zi,zpred)"
- s itbl("I011","POS")="d zip2(.tmprtn,zt,zi,zpred,zobj)"
+ s ii=$s(zw="S":"PSO",zw="P":"POS",zw="O":"OPS") ; pred constraint
+ s ix=$s(zw="O":"d just(zpred)",1:"d zip1(.tmprtn,zt,zi,zpred)")
+ s itbl("I010","PSO")=ix
+ s ii=$s(zw="S":"POS",zw="P":"OPS",zw="O":"OSP") ; pred + obj constraint
+ s ix=$s(zw="S":"d zip2(.tmprtn,zt,zi,zpred,zobj)",zw="P":"d just(zpred)",zw="O":"d just(zobj)",1:"d just(zobj)")
+ s itbl("I011","POS")=ix
  s itbl("I100","SPO")="d zip(.tmprtn,zt,zi)"
  s itbl("I101","OSP")="d zip1(.tmprtn,zt,zi,zobj)"
@@ -186 +190 @@
  k listrtn
  d strings(.listrtn,"tmprtn") ; convert pointer to strings
+ q
+ ;
+just(zin) ; add one element to tmprtn
+ s tmprtn(zin)=""
  q
  ;