[q-lang-cvs] q/stdlib prelude.q,1.20,1.21

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/q/stdlib
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24137

Modified Files:
	prelude.q 
Log Message:
cosmetic changes

Index: prelude.q
===================================================================
RCS file: /cvsroot/q-lang/q/stdlib/prelude.q,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** prelude.q	9 Jun 2006 11:20:04 -0000	1.20
--- prelude.q	9 Jun 2006 12:11:12 -0000	1.21
***************
*** 148,153 ****
  
  {X:Num..Y:Num}		= takewhile (<=Y) (numstream X);
! {X:Num,Y:Num..Z:Num}	= takewhile (<=Z) (numstreamby (Y-X) X) if X<Y;
! 			= takewhile (>=Z) (numstreamby (Y-X) X) if X>Y;
  streamenum X:Num Y:Num	= takewhile (<=Y) (numstream X);
  
--- 148,153 ----
  
  {X:Num..Y:Num}		= takewhile (<=Y) (numstream X);
! {X:Num,Y:Num..Z:Num}	= takewhile P (numstreamby D X) if D<>0
! 			    where D = Y-X, P = if D>0 then (<=Z) else (>=Z);
  streamenum X:Num Y:Num	= takewhile (<=Y) (numstream X);
  
***************
*** 161,168 ****
  {X:Char..Y:Char}	= takewhile (<=Y) Xs
  			    where Xs:Stream = {X..};
! {X:Char,Y:Char..Z:Char}	= takewhile (<=Z) Xs where Xs:Stream = {X,Y..} if D>0
! 			    where D = Y-X;
! 			= takewhile (>=Z) Xs where Xs:Stream = {X,Y..} if D<0
! 			    where D = Y-X;
  streamenum X:Char Y:Char= takewhile (<=Y) Xs
  			    where Xs:Stream = streamenum_from X;
--- 161,166 ----
  {X:Char..Y:Char}	= takewhile (<=Y) Xs
  			    where Xs:Stream = {X..};
! {X:Char,Y:Char..Z:Char}	= takewhile P Xs where Xs:Stream = {X,Y..} if D<>0
! 			    where D = Y-X, P = if D>0 then (<=Z) else (>=Z);
  streamenum X:Char Y:Char= takewhile (<=Y) Xs
  			    where Xs:Stream = streamenum_from X;
***************
*** 177,184 ****
  {X..Y}			= takewhile (<=Y) Xs
  			    where Xs:Stream = {X..}, _:Int = Y-X;
! {X,Y..Z}		= takewhile (<=Z) Xs where Xs:Stream = {X,Y..} if D>0
! 			    where D:Int = Y-X, _:Int = Z-X if isenum X;
! 			= takewhile (>=Z) Xs where Xs:Stream = {X,Y..} if D<0
! 			    where D:Int = Y-X, _:Int = Z-X if isenum X;
  streamenum X Y		= takewhile (<=Y) Xs
  			    where Xs:Stream = streamenum_from X, _:Int = Y-X;
--- 175,181 ----
  {X..Y}			= takewhile (<=Y) Xs
  			    where Xs:Stream = {X..}, _:Int = Y-X;
! {X,Y..Z}		= takewhile P Xs where Xs:Stream = {X,Y..} if D<>0
! 			    where D:Int = Y-X, _:Int = Z-X,
! 			      P = if D>0 then (<=Z) else (>=Z) if isenum X;
  streamenum X Y		= takewhile (<=Y) Xs
  			    where Xs:Stream = streamenum_from X, _:Int = Y-X;