Changeset 924

Timestamp:

Jul 1, 2003, 6:38:19 AM (18 years ago)

Author:

orlov

Message:

• Fixed compilation of $error's.

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail.rf (modified) (2 diffs)
• rfp_clashes.rf (modified) (1 diff)
• rfp_compile.rf (modified) (11 diffs)
• rfp_vars.rf (modified) (3 diffs)
• rfp_vars.rfi (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail.rf

@@ -98 +98 @@
       };
     (TRY e.body) =
-      ('trap {' (<ASAIL-To-CPP e.body>) '}');
+      ('trap') ('{' (<ASAIL-To-CPP e.body>) '}');
     (CATCH-ERROR e.body) =
-      ('with {' (<ASAIL-To-CPP e.body>) '}');
+      ('with') <ASAIL-To-CPP e.body>;
     RETURN = ('return true;');
     RETFAIL = ('retfail;');
@@ -205 +205 @@
         <Expr-Int-To-CPP e.pos>   ', ' <Expr-Int-To-CPP e.len> ')';
   (REF t.name) = <Name-To-CPP t.name>;
+  ERROR-EXPR = 'err';
   (s.var-tag t.name) = <Rfp2Cpp (s.var-tag t.name)>;
 };

to-imperative/trunk/compiler/rfp_clashes.rf

@@ -152 +152 @@
     <Classify-Lengths (s.idx (e.Re) (s.dir e.Pe))> :: e.boxes1,
     /*
-     * Если e.R1 -- переменная или константа, кладём его в ящик
+     * Если e.R1 -- переменная или константа, кладём её в ящик
      * &Ready-Source.
      */

to-imperative/trunk/compiler/rfp_compile.rf

@@ -243 +243 @@
   <Gener-Vars (e.in) "arg"> :: e.in,
   <Vars e.in> :: e.arg-vars,
-  <Vars-Decl e.arg-vars> : e,
+  <Vars-Decl e.arg-vars> : e, // ???
   <Map &Set-Var- (Instantiated? True) (e.arg-vars)> : e,
   <Store &Arg-Vars e.arg-vars>,
@@ -394 +394 @@
   (s.dir e.Pattern) e.Snt, s.dir : \{ LEFT; RIGHT; } =
     <Get-Clash-Sequence (e.last-Re) e.Sentence> :: (e.clashes) e.Sentence,
-//    <WriteLN XXX e.clashes>,
     <Comp-Clashes (e.clashes) s.tail? (v.fails) e.Sentence>;
 
@@ -415 +414 @@
      * If so, we should declare variables from that expression before
      * entering any branch -- those should be visible after the block.
+     * Pattern or format expression is placed in the end of each branch.
+     * But if a branch computes to $error, the expression shouldn't be
+     * used, so protect it with (Comp If-not-error).
      * If next after the block is (Comp Error) then block results should be
      * used as values for $error, so place (Comp Error) in the end of each
      * branch.
+     * If next after the block is (Comp If-not-error) then our block is in
+     * the end of a branch of an outer block and has next pattern or format
+     * inherited from there.  In that case we should place all the sentence
+     * rest in the end of each branch because the block can be inside the
+     * $error already.
      */
     {
@@ -432 +439 @@
         <Vars e.expr> :: e.vars,
 *                               <New-Vars e.vars>,
-        (<Vars-Decl e.vars>) (t.first) ((Comp Source)) e.rest;
+        (<Vars-Decl e.vars>) ((Comp If-not-error) t.first)
+        ((Comp Source)) e.rest;
       (Comp Error) e.rest =
         () ((Comp Error)) () /*empty*/;
+      (Comp If-not-error) e.rest =
+        () (e.Snt) () /*empty*/;
       e = () () () e.Snt;
-    } :: (e.decls) (e.next-term) (e.source?) e.Snt,
+    } :: (e.decls) (e.next-terms) (e.source?) e.Snt,
     /*
      * The block is a source if after it goes pattern or format expression
@@ -480 +490 @@
           (v.branch-fails ((BREAK t.br-label)))
           (e.last-Re)
-          e.branch e.next-term
+          e.branch e.next-terms
         > :: e.comp-br,
         <Recall-Snt-State>,
@@ -487 +497 @@
     e.branches : (BRANCH e.branch) =
     <Comp-Sentence
-      s.tail-branch? (v.branch-fails) (e.last-Re) e.branch e.next-term
+      s.tail-branch? (v.branch-fails) (e.last-Re) e.branch e.next-terms
     > :: e.last-branch,
     <Pop-Snt-State>,
@@ -505 +515 @@
    * Then compile $iter condition and body both with the current state of the
    * sentence.
-   * e.Snt can contain only (Comp Error), so compile it together with the
+   * e.Snt can contain (Comp Error) and (protected from errors) pattern or
+   * format which comes from an outer block, so compile it together with the
    * condition.
    * If condition fails we should compute the body, so put the compiled
@@ -527 +538 @@
    * Then recall the state of the sentence and compile catching of an error
    * with a variable err.
-   * e.Snt can be only (Comp Error), so compile it together with both
-   * sentences -- when either of it comuptes to an object expression it
-   * becomes a value of the $error.
+   * e.Snt can contain (Comp Error) and (protected from errors) pattern or
+   * format which comes from an outer block, so compile it together with both
+   * sentences.
    */
   (TRY (BRANCH e.try) e.catch) e.Snt =
@@ -535 +546 @@
     <Comp-Sentence Notail ((FATAL)) () e.try e.Snt> :: e.comp-try,
     <Pop-Snt-State>,
-    <Comp-Sentence s.tail? (v.fails) () (RESULT (EVAR ("err" 0))) e.catch e.Snt>
-      :: e.comp-catch,
+    <Gener-Err-Var> :: t.var,
+    <Set-Var (Instantiated? True) t.var>,
+    <Comp-Sentence s.tail? (v.fails) (t.var) e.catch e.Snt> :: e.comp-catch,
     (TRY e.comp-try) (CATCH-ERROR e.comp-catch);
 
@@ -605 +617 @@
     (LABEL (t.label) e.comp-negation) <Comp-Sentence s.tail? (v.fails) () e.Snt>;
 
-//  (Comp Verbatim expr) = expr;
-
   /*
    * In case of $error all fails become $error(Fname "Unexpected fail").  So
@@ -614 +624 @@
    */
   (ERROR) e.Snt =
-    <Comp-Sentence Notail ((FATAL)) e.Snt () (Comp Error)>;
-
-  (Comp Error) e.Snt = (ERROR e.last-Re);
+    <Comp-Sentence Notail ((FATAL)) () e.Snt (Comp Error)>;
+
+  (Comp Error) e.Snt =
+    <Comp-Static-Exprs (e.last-Re)> : (e.Re),
+    (ERROR e.Re);
+
+  /*
+   * Protection mark to be used between source and tail.  If there is $error
+   * construction somewhere in the source then the tail shouldn't be
+   * computed, but instead the source value should be used for throwing.
+   */
+  (Comp If-not-error) e.Snt =
+    {
+      e.Snt : e (Comp Error) =
+        <Comp-Sentence s.tail? (v.fails) (e.last-Re) (Comp Error)>;
+      <Comp-Sentence s.tail? (v.fails) (e.last-Re) e.Snt>;
+    };
 
 //  (Comp Fatal) = FATAL;
 
 //  (Comp Retfail) = RETFAIL;
-
-  (Comp Fail t.fail) e.Snt = <Comp-Sentence s.tail? (v.fails t.fail) () e.Snt>;
 
 };

to-imperative/trunk/compiler/rfp_vars.rf

@@ -232 +232 @@
       (s.tag <Box 1 e.prefix>) <Gener-Vars (e.Fe) e.prefix>;
     };
-    e.format : (PAREN e1) e2 =
-      (PAREN <Gener-Vars (e1) e.prefix>) <Gener-Vars (e2) e.prefix>;
+    e.format : (PAREN v1) e2 =
+      (PAREN <Gener-Vars (v1) e.prefix>) <Gener-Vars (e2) e.prefix>;
     e.format : t.Ft e.Fe =
       t.Ft <Gener-Vars (e.Fe) e.prefix>;
@@ -241 +241 @@
 *       <New-Vars e.vars>,
 *       (e.vars) e.Re;
+
+Gener-Err-Var = (EVAR <Box 2>);
 
 
@@ -282 +284 @@
         <Store s.box t.var>,
         t.var <Boxes-To-Vars expr>;
+      2 =
+        ERROR-EXPR <Boxes-To-Vars expr>;
       t.var = <Boxes-To-Vars t.var expr>;
     };

to-imperative/trunk/compiler/rfp_vars.rfi

@@ -22 +22 @@
 
 $func Gener-Vars (e.format) e.prefix = /*(e.vars)*/ e.Re;
+
+$func Gener-Err-Var = t.var;
 
 $func? Generated-Var? e.Re = ;