Commit4b0d53d

Alexander Korotkov

committed

Fix operations with ranges.

1 parent25a2eec commit4b0d53dCopy full SHA for 4b0d53d

File tree

+24

-2

lines changed

+24

-2

lines changed

Lines changed: 24 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`bool`
`5`	`5`	`irange_intersects(IndexRangea,IndexRangeb)`
`6`	`6`	`{`
`7`		`-return (irange_lower(a) <=irange_upper(b))\|\|`
	`7`	`+return (irange_lower(a) <=irange_upper(b))&&`
`8`	`8`	`(irange_lower(b) <=irange_upper(a));`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`/* Check if two ranges are conjuncted */`
`12`	`12`	`bool`
`13`	`13`	`irange_conjuncted(IndexRangea,IndexRangeb)`
`14`	`14`	`{`
`15`		`-return (irange_lower(a)-1 <=irange_upper(b))\|\|`
	`15`	`+return (irange_lower(a)-1 <=irange_upper(b))&&`
`16`	`16`	`(irange_lower(b)-1 <=irange_upper(a));`
`17`	`17`	`}`
`18`	`18`
`@@ -35,6 +35,27 @@ irange_intersect(IndexRange a, IndexRange b)`
`35`	`35`	`irange_is_lossy(a)\|\|irange_is_lossy(b));`
`36`	`36`	`}`
`37`	`37`
	`38`	`+#ifdefNOT_USED`
	`39`	`+/* Print range list in debug purposes */`
	`40`	`+staticchar*`
	`41`	`+print_irange(List*l)`
	`42`	`+{`
	`43`	`+ListCell*c;`
	`44`	`+StringInfoDatastr;`
	`45`	`+`
	`46`	`+initStringInfo(&str);`
	`47`	`+`
	`48`	`+foreach (c,l)`
	`49`	`+{`
	`50`	`+IndexRangeir=lfirst_irange(c);`
	`51`	`+`
	`52`	`+appendStringInfo(&str,"[%d,%d]%c ",irange_lower(ir),irange_upper(ir),`
	`53`	`+irange_is_lossy(ir) ?'l' :'e');`
	`54`	`+}`
	`55`	`+returnstr.data;`
	`56`	`+}`
	`57`	`+#endif`
	`58`	`+`
`38`	`59`	`/*`
`39`	`60`	`* Make union of two index rage lists.`
`40`	`61`	`*/`
`@@ -192,6 +213,7 @@ irange_list_intersect(List a, List b)`
`192`	`213`	`if (irange_upper(ra) >=irange_upper(rb))`
`193`	`214`	`cb=lnext(cb);`
`194`	`215`	`}`
	`216`	`+`
`195`	`217`	`returnresult;`
`196`	`218`	`}`
`197`	`219`

Comments

(0)