Changeset 2034 for to-imperative/trunk/compiler/rfp_check.rf

Timestamp:

Jul 27, 2006, 8:40:44 AM (14 years ago)

Author:

orlov

Message:

• Proper generation of debug info for use with Debug library (-dbg option).
• Result expressions can contain blocks.

File:

• to-imperative/trunk/compiler/rfp_check.rf (modified) (1 diff)

to-imperative/trunk/compiler/rfp_check.rf

@@ -165 +165 @@
     e.Sentence : t.Statement e.Snt,
       t.Statement : {
-        (RESULT t e.Re) =
-          {
-            <Vars e.Re> : e (s.type t.Pragma e.name) e,
+        (RESULT t e.Re) = <Check-Vars (e.vars) e.Re>, e.vars;
+        (PAREN e.Re) = <Check-Vars (e.vars) e.Re>, e.vars;
+        (CALL t t e.Re) = <Check-Vars (e.vars) e.Re>, e.vars;
+        (s.type t.Pragma e.name), s.type : \{ EVAR; SVAR; TVAR; VVAR; } =
+          {
+            e.vars : e (s.t t.p e.name) e,
               {
-                e.vars : e (s.t t.p e.name) e,
-                  {
-                    s.t : s.type;
-                    <Print-Error Error!
-                      Var-Type (s.t t.p e.name) s.type t.Pragma>;
-                  };
-                <Print-Error Error!
-                  Var-Re (s.type t.Pragma e.name) t.Pragma>;
-              },
-              $fail;
-            e.vars;
-          };
+                s.t : s.type;
+                <Print-Error Error! Var-Type (s.t t.p e.name) s.type t.Pragma>;
+              };
+            <Print-Error Error! Var-Re (s.type t.Pragma e.name) t.Pragma>;
+          },
+          e.vars;
         (FORMAT t e.He) =
           <Vars e.He> : e.He-vars,