[pure-lang-svn] SF.net SVN: pure-lang: [251] pure/trunk/lib

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

Revision: 251
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=251&view=rev
Author:   agraef
Date:     2008-06-18 00:23:39 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Rename '|' -> 'or', '&' -> 'and'.

Modified Paths:
--------------
    pure/trunk/lib/prelude.pure
    pure/trunk/lib/primitives.pure

Modified: pure/trunk/lib/prelude.pure
===================================================================
--- pure/trunk/lib/prelude.pure	2008-06-17 13:44:16 UTC (rev 250)
+++ pure/trunk/lib/prelude.pure	2008-06-18 07:23:39 UTC (rev 251)
@@ -54,8 +54,8 @@
 infix  4   === !== ;		// syntactic equality
 infixr 4   : ;			// list cons
 infixl 5   << >> ;		// bit shifts
-infixl 6   + - | ;		// addition, bitwise or
-infixl 7   * / div mod & ;	// multiplication, bitwise and
+infixl 6   + - or ;		// addition, bitwise or
+infixl 7   * / div mod and ;	// multiplication, bitwise and
 prefix 7   ~ ;			// bitwise not
 infixr 8   ^ ;			// exponentiation
 prefix 8   # ;			// size operator

Modified: pure/trunk/lib/primitives.pure
===================================================================
--- pure/trunk/lib/primitives.pure	2008-06-17 13:44:16 UTC (rev 250)
+++ pure/trunk/lib/primitives.pure	2008-06-18 07:23:39 UTC (rev 251)
@@ -102,12 +102,12 @@
 
 x::int+y::int		= x+y;
 x::int-y::int		= x-y;
-x::int|y::int		= x|y;
 x::int*y::int		= x*y;
 x::int/y::int		= x/y;
-x::int&y::int		= x&y;
 x::int div y::int	= x div y;
 x::int mod y::int	= x mod y;
+x::int or y::int	= x or y;
+x::int and y::int	= x and y;
 
 x::int<y::int		= x<y;
 x::int>y::int		= x>y;
@@ -189,12 +189,12 @@
 
 x::bigint+y::bigint	= bigint_add x y;
 x::bigint-y::bigint	= bigint_sub x y;
-x::bigint|y::bigint	= bigint_or x y;
 x::bigint*y::bigint	= bigint_mul x y;
 x::bigint/y::bigint	= double x / double y;
-x::bigint&y::bigint	= bigint_and x y;
 x::bigint div y::bigint	= bigint_div x y;
 x::bigint mod y::bigint	= bigint_mod x y;
+x::bigint or y::bigint	= bigint_or x y;
+x::bigint and y::bigint	= bigint_and x y;
 
 x::bigint<y::bigint	= bigint_cmp x y < 0;
 x::bigint>y::bigint	= bigint_cmp x y > 0;
@@ -207,12 +207,12 @@
 
 x::int+y::bigint	= bigint x+y;
 x::int-y::bigint	= bigint x-y;
-x::int|y::bigint	= bigint x|y;
 x::int*y::bigint	= bigint x*y;
 x::int/y::bigint	= double x/y;
-x::int&y::bigint	= bigint x&y;
 x::int div y::bigint	= bigint x div y;
 x::int mod y::bigint	= bigint x mod y;
+x::int or y::bigint	= bigint x or y;
+x::int and y::bigint	= bigint x and y;
 
 x::int<y::bigint	= bigint x<y;
 x::int>y::bigint	= bigint x>y;
@@ -223,12 +223,12 @@
 
 x::bigint+y::int	= x+bigint y;
 x::bigint-y::int	= x-bigint y;
-x::bigint|y::int	= x|bigint y;
 x::bigint*y::int	= x*bigint y;
 x::bigint/y::int	= x/double y;
-x::bigint&y::int	= x&bigint y;
 x::bigint div y::int	= x div bigint y;
 x::bigint mod y::int	= x mod bigint y;
+x::bigint or y::int	= x or bigint y;
+x::bigint and y::int	= x and bigint y;
 
 x::bigint<y::int	= x<bigint y;
 x::bigint>y::int	= x>bigint y;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.