X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDev%2FMod%2FCPR.cp;h=03c3fe40dc5605797ee685f63cffa3b39de739e0;hp=b43b539bd2beebe3747961b7bd2aa1acb037a02e;hb=6f35998ea70a845e762ec234aa097d1fe414ecf3;hpb=e52a3df8538aa38dde9851e00b98b0cffe3c6750

diff --git a/src/generic/Dev/Mod/CPR.cp b/src/generic/Dev/Mod/CPR.cp
index b43b539..03c3fe4 100644
--- a/src/generic/Dev/Mod/CPR.cp
+++ b/src/generic/Dev/Mod/CPR.cp
@@ -7,13 +7,10 @@ MODULE DevCPR;
 
     (* symbol values *)
     null = 0;
-    if = 1; then = 2; else = 3; elsif = 4; end = 5; new = 6;
-    ident = 7; plus = 8; minus = 9;
-    not = 10; and = 11; or = 12; rpar = 13; lpar = 14;
-    endcom = 15; eof = 16;
-
-    (* func numbers *)
-    var = 0; defined = 1;
+    if = 1; then = 2; else = 3; elsif = 4; end = 5;
+    new = 6; error = 7; ident = 8; plus = 9; minus = 10;
+    not = 11; and = 12; or = 13; rpar = 14; lpar = 15; defined = 16;
+    endcom = 17; eof = 18;
 
   TYPE
     Context = POINTER TO RECORD
@@ -26,8 +23,7 @@ MODULE DevCPR;
     Selector = POINTER TO RECORD
       next: Selector;
       name: DevCPT.Name;
-      val: BOOLEAN;
-      num: BYTE
+      val: BOOLEAN
     END;
 
   VAR
@@ -70,16 +66,18 @@ MODULE DevCPR;
         IF ch = ">" THEN sym := endcom; DevCPM.Get(ch) END
     | "+": sym := plus; DevCPM.Get(ch)
     | "-": sym := minus; DevCPM.Get(ch)
+    | "D": Identifier(sym); IF name = "DEFINED" THEN sym := defined END
     | "E": Identifier(sym);
         IF name = "END" THEN sym := end
         ELSIF name = "ELSE" THEN sym := else
         ELSIF name = "ELSIF" THEN sym := elsif
+        ELSIF name = "ERROR" THEN sym := error
         END
     | "I": Identifier(sym); IF name = "IF" THEN sym := if END
     | "N": Identifier(sym); IF name = "NEW" THEN sym := new END
     | "O": Identifier(sym); IF name = "OR" THEN sym := or END
     | "T": Identifier(sym); IF name = "THEN" THEN sym := then END
-    | "A".."D", "J".."M", "P".."S", "U".."Z", "a".."z", "_": Identifier(sym)
+    | "A".."C", "J".."M", "P".."S", "U".."Z", "a".."z", "_": Identifier(sym)
     | "~": sym := not; DevCPM.Get(ch)
     ELSE
       IF Strings.IsIdent(ch) THEN Identifier(sym) ELSE sym := null; DevCPM.Get(ch) END
@@ -91,8 +89,7 @@ MODULE DevCPR;
   BEGIN
     s := scope;
     WHILE (s.next # NIL) & (s.next.name$ # name$) DO s := s.next END;
-    IF s.next = NIL THEN
-      NEW(s.next); s.next.name := name$; s.next.num := var; s.next.val := val
+    IF s.next = NIL THEN NEW(s.next); s.next.name := name$; s.next.val := val
     ELSE err(1)
     END;
     RETURN s.next
@@ -104,7 +101,7 @@ MODULE DevCPR;
     s := scope;
     WHILE (s.next # NIL) & (s.next.name$ # name$) DO s := s.next END;
     IF s.next = NIL THEN
-      err(0); NEW(s.next); s.next.name := name$; s.next.num := var; s.next.val := FALSE
+      err(0); NEW(s.next); s.next.name := name$; s.next.val := FALSE
     END;
     RETURN s.next
   END Old;
@@ -123,31 +120,29 @@ MODULE DevCPR;
     s := scope;
     WHILE (s.next # NIL) & (s.next.name$ # name$) DO s := s.next END;
     IF s.next = NIL THEN NEW(s.next) END;
-    s.next.name := name$; s.next.num := var; s.next.val := val
+    s.next.name := name$; s.next.val := val
   END Set;
 
   PROCEDURE ^ Expression (VAR x: BOOLEAN);
 
   PROCEDURE Factor (VAR x: BOOLEAN);
-    VAR s: Selector;
-  BEGIN x := FALSE;
+  BEGIN
     IF sym = ident THEN
-      s := Old(name); Get(sym);
-      IF s.num = var THEN
-         x := s.val
-      ELSIF sym = lpar THEN
+      x := Old(name).val; Get(sym);
+    ELSIF sym = defined THEN
+      Get(sym);
+      IF sym = lpar THEN
         Get(sym);
-        ASSERT(s.num = defined);
         IF sym = ident THEN
-          x := Find(name) # NIL; Get(sym)
+          x := Find(name) # NIL;
+          Get(sym)
         ELSE err(48)
         END;
         IF sym # rpar THEN err(23)
         ELSE Get(sym)
         END
-      ELSE
-        err(40)
-      END
+      ELSE err(40)
+      END      
     ELSIF sym = lpar THEN
       Get(sym); Expression(x);
       IF sym # rpar THEN err(23)
@@ -156,6 +151,7 @@ MODULE DevCPR;
     ELSIF sym = not THEN
       Get(sym); Factor(x); x := ~x
     ELSE
+      x := FALSE;
       err(13)
     END
   END Factor;
@@ -200,6 +196,14 @@ MODULE DevCPR;
     IF top = NIL THEN err(51); fold := 0; If(TRUE) END
   END End;
 
+  PROCEDURE Printable* (): BOOLEAN;
+    VAR c: Context;
+  BEGIN
+    c := top;
+    WHILE (c # NIL) & c.val DO c := c.next END;
+    RETURN c = NIL
+  END Printable;
+
   PROCEDURE Parse*;
     VAR val: BOOLEAN; s: Selector;
   BEGIN
@@ -208,7 +212,12 @@ MODULE DevCPR;
       Get(sym);
       IF sym = ident THEN s := New(name, FALSE); Get(sym)
       ELSE err(48)
+      END;
+      IF (sym = plus) OR (sym = minus) THEN
+        s.val := sym = plus; Get(sym)
       END
+    ELSIF sym = error THEN
+      IF Printable() THEN err(501) END; Get(sym)
     ELSIF sym = ident THEN
       Get(sym);
       IF sym = plus THEN Old(name).val := TRUE; Get(sym)
@@ -238,14 +247,6 @@ MODULE DevCPR;
     IF sym # endcom THEN err(5) ELSE DevCPM.errpos := DevCPM.curpos - 1 END
   END Parse;
 
-  PROCEDURE Printable* (): BOOLEAN;
-    VAR c: Context;
-  BEGIN
-    c := top;
-    WHILE (c # NIL) & c.val DO c := c.next END;
-    RETURN c = NIL
-  END Printable;
-
   PROCEDURE Check*;
   BEGIN
     IF fold # 1 THEN err(14) END
@@ -263,9 +264,8 @@ MODULE DevCPR;
     Close;
     If(TRUE);
     NEW(scope);
-    s := New("TRUE", TRUE);
-    s := New("FALSE", FALSE);
-    s := New("DEFINED", FALSE); s.num := defined
+    Set("TRUE", TRUE);
+    Set("FALSE", FALSE)
   END Init;
 
 END DevCPR.