Changeset 289

Timestamp:

Dec 20, 2002, 2:50:55 PM (18 years ago)

Author:

orlov

Message:

* empty log message *

Location:

to-imperative/trunk/compiler

Files:

• rfp_asail.rf (modified) (1 diff)
• rfp_compile.rf (modified) (4 diffs)

to-imperative/trunk/compiler/rfp_asail.rf

@@ -135 +135 @@
     <Expr-Ref-To-CPP 0 e.expr-all>;
   };   
-  (PAREN e.expr) e.rest = <Expr-Ref-To-CPP 0 e.expr-all>;
-  (EXPR e.expr) e.rest = <Expr-Ref-To-CPP 0 e.expr-all>;
-  (DEREF e.expr) e.rest = <Expr-Ref-To-CPP 0 e.expr-all>;
-  (SUBEXPR e.expr) e.rest = <Expr-Ref-To-CPP 0 e.expr-all>;
+  (PAREN e.expr) e.rest = <Expr-Ref-To-CPP 0 e.init e.expr-all>;
+  (EXPR e.expr) e.rest = <Expr-Ref-To-CPP 0 e.init e.expr-all>;
+  (DEREF e.expr) e.rest = <Expr-Ref-To-CPP 0 e.init e.expr-all>;
+  (SUBEXPR e.expr) e.rest = <Expr-Ref-To-CPP 0 e.init e.expr-all>;
   (LENGTH e.expr) e.rest = <Expr-Int-To-CPP e.init e.expr-all> ;
   (MAX e.args) e.rest = <Expr-Int-To-CPP e.init e.expr-all>;       

to-imperative/trunk/compiler/rfp_compile.rf

@@ -111 +111 @@
   e.compiled-assignments (e.rest-collapses) (e.used-aux-vars);
 
-//$func? Empty-Varlist? (t.var t.Re (/*empty-var-list*/)) = ;
-$func? Empty-Varlist? e = e;
+//$func? Independent? e.collapses (t.var t.Re t.collapsed-vars) = ;
+$func? Independent? e = e;
 
 //$func Remove-Independ e.independ (t.var t.Re (e.var-list)) =
@@ -348 +348 @@
   e.something (e.expr) =
     <Post-Comp (e.used-vars) e.expr> :: (e.expr-vars) e.expr,
-    <Post-Comp (<Or (e.used-vars) e.expr>) e.something> (e.expr);
+    <Post-Comp (<Or (e.used-vars) e.expr-vars>) e.something> (e.expr);
   e.something s.symbol = <Post-Comp (e.used-vars) e.something> s.symbol;
   /*empty*/ = (e.used-vars);
@@ -736 +736 @@
  */
 Comp-Ready-Formats e.collapses =
-  <Split &Empty-Varlist? (e.collapses)> :: (e.independ) (e.collapses),
+  <Split &Independent? e.collapses (e.collapses)> :: (e.independ) (e.collapses),
   <Map &Get-Elem 0 (e.independ)> :: e.indep-vars,
   <Map &Remove-Independ e.indep-vars (e.collapses)> :: e.collapses,
@@ -743 +743 @@
   (<Concat <Map &Get-Aux-Indexes (e.collapses)>>);
 
-Empty-Varlist? (t.var t.Re (/*empty-var-list*/)) = ;
+Independent? e.collapses (t.var t.Re t.collapsed-vars) =
+  # \{ e.collapses : e (t t (e t.var e)) e; };
 
 Remove-Independ e.independ (t.var t.Re (e.var-list)) =