Commitd0ad0de

committed

Merge branch 'master' into vodka

2 parents61dd5f6 +7cd775b commitd0ad0deCopy full SHA for d0ad0de

File tree

+27

-0

lines changed

+27

-0

lines changed

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -604,6 +604,31 @@ queryHasPositive(ExtractedNode *node)`
`604`	`604`	`}`
`605`	`605`	`}`
`606`	`606`
	`607`	`+staticbool`
	`608`	`+needRecheckRecursive(ExtractedNode*node,boolnot)`
	`609`	`+{`
	`610`	`+inti;`
	`611`	`+switch(node->type)`
	`612`	`+{`
	`613`	`+caseeAnd:`
	`614`	`+caseeOr:`
	`615`	`+if (node->type==eAnd&& !not&&node->indirect)`
	`616`	`+return true;`
	`617`	`+if (node->type==eOr&&not&&node->indirect)`
	`618`	`+return true;`
	`619`	`+for (i=0;i<node->args.count;i++)`
	`620`	`+{`
	`621`	`+if (needRecheckRecursive(node->args.items[i],not))`
	`622`	`+return true;`
	`623`	`+}`
	`624`	`+return false;`
	`625`	`+caseeNot:`
	`626`	`+return !needRecheckRecursive(node->args.items[0], !not);`
	`627`	`+caseeScalar:`
	`628`	`+return false;`
	`629`	`+}`
	`630`	`+}`
	`631`	`+`
`607`	`632`	`ExtractedNode*`
`608`	`633`	`extractJsQuery(JsQuery*jq,MakeEntryHandlerhandler,Pointerextra)`
`609`	`634`	`{`
`@@ -618,6 +643,8 @@ extractJsQuery(JsQuery *jq, MakeEntryHandler handler, Pointer extra)`
`618`	`643`	`}`
`619`	`644`	`if (root&& !queryHasPositive(root))`
`620`	`645`	`root=NULL;`
	`646`	`+if (root)`
	`647`	`+root->indirect=needRecheckRecursive(root, false);`
`621`	`648`	`returnroot;`
`622`	`649`	`}`
`623`	`650`

Comments

(0)