--- rat/lonuserstate.pm	2000/08/31 10:14:08	1.6
+++ rat/lonuserstate.pm	2000/09/04 11:28:04	1.7
@@ -10,7 +10,7 @@
 # 7/1 Gerd Kortemeyer)
 # 7/1,7/3,7/4,7/7,7/8,7/10 Gerd Kortemeyer)
 #
-# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30 Gerd Kortemeyer
+# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,9/2,9/4 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -179,16 +179,14 @@ sub loadmap {
 
 sub simplify {
    my $expression=shift;
-# "True and" is nothing 
-   $expression=~s/0\&//g;
 # (8)=8
    $expression=~s/\((\d+)\)/$1/g;
 # 8&8=8
-   $expression=~s/(\d+)\&\1/$1/g;
+   $expression=~s/(\D)(\d+)\&\2(\D)/$1$2$3/g;
 # 8|8=8
-   $expression=~s/(\d+)\|\1/$1/g;
+   $expression=~s/(\D)(\d+)\|\2(\D)/$1$2$3/g;
 # (5&3)&4=5&3&4
-   $expression=~s/\((\d+)\&(\d+)\)\&(\d+)/$1\&$2\&$3/g;
+   $expression=~s/\((\d+)((?:\&\d+)+)\)\&(\d+\D)/$1$2\&$3/g;
 # (((5&3)|(4&6)))=((5&3)|(4&6))
    $expression=~
        s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g;
@@ -252,14 +250,14 @@ sub accinit {
           map {
              my $sub=$_;
              my $orig=$_;
-             $sub=~/\(\((\d+(:?\&\d+)*)(?:\&\d+)+\)(?:\|\(\1(?:\&\d+)+\))+\)/;
+             $sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/;
              my $factor=$1;
-             $sub=~s/$factor\&//g;
-             $sub=~s/^\(/\($factor\&\(/;
+             $sub=~s/$factor//g;
+             $sub=~s/^\(/\($factor\(/;
 	     $sub.=')';
              $sub=simplify($sub);
              $orig=~s/(\W)/\\$1/g;
-	     $expr=~s/$orig/$sub/;
+ 	     $expr=~s/$orig/$sub/;
 	  } ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g);
           $hash{$_}=$expr;
           unless (defined($captured{$expr})) {