X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDev%2FMod%2FCPR.cp;h=b3ef0524cb2474b2bafbbd6249c362ad5c3dac04;hp=7791454cd607538d29b831f4d9ef1532a24fe4c3;hb=f2367fdce1d3ed0d4caeabca10d83c8d2c03b43e;hpb=5adfcb4517689a90c7640ff2add9761ba042677a

diff --git a/src/generic/Dev/Mod/CPR.cp b/src/generic/Dev/Mod/CPR.cp
index 7791454..b3ef052 100644
--- a/src/generic/Dev/Mod/CPR.cp
+++ b/src/generic/Dev/Mod/CPR.cp
@@ -162,7 +162,7 @@ MODULE DevCPR;
   BEGIN
     Factor(x, use);
     WHILE sym = and DO
-      Get(sym); Factor(y, use); IF use THEN x := x & y END
+      Get(sym); Factor(y, use & x); IF use & x THEN x := x & y END
     END
   END Term;
 
@@ -171,7 +171,7 @@ MODULE DevCPR;
   BEGIN
     Term(x, use);
     WHILE sym = or DO
-      Get(sym); Term(y, use); IF use THEN x := x OR y END
+      Get(sym); Term(y, use & ~x); IF use & ~x THEN x := x OR y END
     END
   END Expression;