20061220

2 files changed, 7 insertions, 0 deletions

diff --git a/module/keyring.m b/module/keyring.m
index 753aea12..08a3ef94 100644
--- a/module/keyring.m
+++ b/module/keyring.m
@@ -41,6 +41,12 @@ Keyring: module
 		# shifts
 		shl:	fn(i: self ref IPint, n: int): ref IPint;
 		shr:	fn(i: self ref IPint, n: int): ref IPint;
+
+		# bitwise
+		and:	fn(i1: self ref IPint, i2: ref IPint): ref IPint;
+		ori:	fn(i1: self ref IPint, i2: ref IPint): ref IPint;
+		xor:	fn(i1: self ref IPint, i2: ref IPint): ref IPint;
+		not:	fn(i1: self ref IPint): ref IPint;
 	};
 
 	# signature algorithm
diff --git a/module/xml.m b/module/xml.m
index ee83a0c1..a6d8e09e 100644
--- a/module/xml.m
+++ b/module/xml.m
@@ -75,4 +75,5 @@ Xml: module {
 	};
 	init:	fn(): string;
 	open: fn(f: string, warning: chan of (Locator, string), preelem: string): (ref Parser, string);
+	fopen:	fn(f: ref Bufio->Iobuf, srcname: string, warning: chan of (Locator, string), preelem: string): (ref Parser, string);
 };