Commit16c6cdf

committed

Merge branch 'master' into vodka

2 parents26d3607 +aa36e6f commit16c6cdfCopy full SHA for 16c6cdf

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -574,9 +574,12 @@ extractJsQuery(JsQuery *jq, MakeEntryHandler handler, Pointer extra)`
`574`	`574`	`ExtractedNode*root;`
`575`	`575`
`576`	`576`	`root=recursiveExtract(VARDATA(jq),0, false,NULL);`
`577`		`-flatternTree(root);`
`578`		`-simplifyRecursive(root);`
`579`		`-root=makeEntries(root,handler,extra);`
	`577`	`+if (root)`
	`578`	`+{`
	`579`	`+flatternTree(root);`
	`580`	`+simplifyRecursive(root);`
	`581`	`+root=makeEntries(root,handler,extra);`
	`582`	`+}`
`580`	`583`	`returnroot;`
`581`	`584`	`}`
`582`	`585`

Comments

(0)