Changeset 881

Timestamp:

Jun 29, 2003, 5:33:31 AM (18 years ago)

Author:

orlov

Message:

• Generation of FLAT-EQ is removed and generation of TERM-EQ is added.

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail.rf (modified) (1 diff)
• rfp_clashes.rf (modified) (1 diff)
• rfp_compile.rf (modified) (6 diffs)
• rfp_compile.rfi (modified) (1 diff)
• rfp_vars.rf (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail.rf

@@ -244 +244 @@
     <Expr-Ref-To-CPP e.expr1> '.eq ('
       <Expr-Ref-To-CPP e.expr2> ', ' <Expr-Int-To-CPP e.pos> ')'; 
-  (FLAT-EQ e.expr1 (e.expr2) (e.pos)) =
-    <Expr-Ref-To-CPP e.expr1> '.flat_eq ('
+  (TERM-EQ e.expr1 (e.expr2) (e.pos)) =
+    <Expr-Ref-To-CPP e.expr1> '.term_eq ('
       <Expr-Ref-To-CPP e.expr2> ', ' <Expr-Int-To-CPP e.pos> ')'; 
   (NOT e.cond) =

to-imperative/trunk/compiler/rfp_clashes.rf

@@ -273 +273 @@
       t.var-e2 ((t.var-e2) (s.dir e.Pe-rest));
   } : t.var-e2 (e.clash),
-  {
-    <Flat? e.Re> = (Flat? True);;
-  } :: e.flat?,
-  <Set-Var (Instantiated? True) e.flat? t.var-e1>,
-  <Set-Var (Instantiated? True) e.flat? t.var-e2>,
+  <Set-Var (Instantiated? True) t.var-e1>,
+  <Set-Var (Instantiated? True) t.var-e2>,
   <Store &Clashes <Compose-Clashes e.clash> e.rest>,
   <Get-Var Clashes t.var-e1> :: e.clashes,

to-imperative/trunk/compiler/rfp_compile.rf

@@ -25 +25 @@
 $use Dos;
 
-/*
- * Functions for distinguishing flat symbols from not flat.
- */
-$const Flat-Symbols = &Char?- &Int?-;
 
 /*
@@ -78 +74 @@
 
 $func Length-of e.Re = e.length;
-
-$func? Flat-Const? e.const = ;
 
 $func? Hard-Exp? e.expr = ;
@@ -771 +765 @@
 
 Comp-Assign-to-Var (t.var (e.Re)) =
-  {
-    <Flat? e.Re> = (Flat? True);;
-  } :: e.flat?,
-  <Set-Var (Instantiated? True) e.flat? t.var>,
+  <Set-Var (Instantiated? True) t.var>,
   {
     t.var : e.Re = /*empty*/;
@@ -1245 +1236 @@
     } :: e.Re-term,
     {
-      <Flat? e.Re> =
-        { <Var? t.Pt> = <Set-Var (Flat? True) t.Pt>;; },
-        FLAT-EQ;
-      <Flat? t.Pt> =
-        { e.Re-term : term, <Var? term> = <Set-Var (Flat? True) term>;; },
-        FLAT-EQ;
+      e.len : 1 = TERM-EQ;      // FIXME: здесь надо использовать
+                  //        калькулятор
       EQ;
     } :: s.eq,
@@ -1265 +1252 @@
         };
       } :: el (er),
-        (IF ((NOT (s.eq el (er) (e.pos)))) e.fail) :: e.cond,
+        (IF ((NOT (s.eq el (er) (e.pos)))) e.fail) :: t.cond,
         {
           e.assigns : $r e1 (SUBEXPR t.Pt e.def) e2 =
-            <CC-Eqs (e.fail) (e1 (SUBEXPR t.Pt e.def) e.cond e2)>;
-          e.cond <CC-Eqs (e.fail) (e.assigns) e.rest>;
+            <CC-Eqs (e.fail) (e1 (SUBEXPR t.Pt e.def) t.cond e2) e.rest>;
+          t.cond <CC-Eqs (e.fail) (e.assigns) e.rest>;
         };
       <Set-Var (Instantiated? True) t.Pt>,
@@ -1894 +1881 @@
 
 
-Flat? {
-  term e.rest =
-    \{
-      <Get-Var Flat? term> : True;
-      term : \{
-        (REF e) = term;
-        (STATIC e) = <Get-Static term>;
-      } :: e.Re,
-        <Flat-Const? e.Re>;
-    },
-    <Flat? e.rest>;
-  /*empty*/;
-};
-
-Flat-Const? {
-  (PAREN e) e = $fail;
-  (REF t.name) e.rest, {
-    <Middle 3 0 <Lookup &Const t.name>> :: e.const =
-      <Flat-Const? e.const> <Flat-Const? e.rest>;
-    <Flat-Const? e.rest>;
-  };
-  s.ObjectSymbol e.rest =
-    &Flat-Symbols : e s.f e, <Apply s.f s.ObjectSymbol> : e =
-    <Flat-Const? e.rest>;
-  /*empty*/;
-};
-
-
-
 /*
  * Ends good if lengths of all variables in the upper level of e.expr can be

to-imperative/trunk/compiler/rfp_compile.rfi

@@ -23 +23 @@
 
 
-$func? Flat? e.Re = ;
-
-
-
 $func? Lookup-Func t.Fname = s.linkage s.tag t.pragma (e.Fin) (e.Fout);
 

to-imperative/trunk/compiler/rfp_vars.rf

@@ -128 +128 @@
     e.info;
   } :: e.info,
-  /*
-   * s-переменные помечаем как плоские.
-   */
-//  {
-//    t.var : (SVAR e) =
-//      {
-//        e.info : e (Flat? e) e = e.info;
-//        e.info (Flat? True);
-//      };
-//    e.info;
-//  } :: e.info,
   <Put &State (t.var e.info)>;