Changeset 288

Timestamp:

Dec 19, 2002, 3:11:29 PM (18 years ago)

Author:

orlov

Message:

* empty log message *

Location:

to-imperative/trunk

Files:

• compiler/rfp_asail.rf (modified) (1 diff)
• runtime/rf_expr.hh (modified) (1 diff)
• runtime/rf_term.hh (modified) (1 diff)

to-imperative/trunk/compiler/rfp_asail.rf

@@ -221 +221 @@
        */
       (EQ (e.expr1) (e.pos1) (e.len1) (e.expr2) (e.pos2) (e.len2)) =
-        'eq ('  <Expr-Ref-To-CPP 0 e.expr1> ', '
-            <Expr-Int-To-CPP e.pos1> ', ' <Expr-Int-To-CPP e.len1> ', ' 
-            <Expr-Ref-To-CPP 0 e.expr2> ', '
-            <Expr-Int-To-CPP e.pos2> ', ' <Expr-Int-To-CPP e.len2> ')'; 
+        'eq_expr (' <Expr-Ref-To-CPP 0 e.expr1> ', '
+              <Expr-Int-To-CPP e.pos1>  ', ' <Expr-Int-To-CPP e.len1> ', ' 
+              <Expr-Ref-To-CPP 0 e.expr2> ', '
+              <Expr-Int-To-CPP e.pos2>  ', ' <Expr-Int-To-CPP e.len2> ')'; 
       /*
        * FLAT-EQ -> to function flat_eq() with 5 arg.

to-imperative/trunk/runtime/rf_expr.hh

@@ -689 +689 @@
 
 friend
-inline bool fast_eq (
-  Term const* _f1, Term const* _l1, Term const* _f2, Term const* _l2
+inline bool eq_expr (
+  const Expr &_e1, uintptr_t _pos1, uintptr_t _len1,
+  const Expr &_e2, uintptr_t _pos2, uintptr_t _len2
 )
 {
-  for (; _f1 < _l1; _f1++, _f2++) {
-    if ((*_f1).get_type() != (*_f2).get_type() || (*_f1).data2 != (*_f2).data2)
+  if (_len1 == _len2) {
+    Term *p1 = _e1.get_first() + _pos1;
+    Term *p2 = _e2.get_first() + _pos2;
+    Term *l1 = p1  + _len1;
+    for (; p1 < l1; p1++, p2++) {
+      if (*p1 != *p2) return false;
+    }
+    return true;
+  }
+  return false;
+}
+
+
+friend
+inline bool flat_eq (
+  const Expr &_e1, uintptr_t _pos1,
+  const Expr &_e2, uintptr_t _pos2, uintptr_t _len
+)
+{
+  Term *p1 = _e1.get_first() + _pos1;
+  Term *p2 = _e2.get_first() + _pos2;
+  Term *l1 = p1  + _len;
+  for (; p1 < l1; p1++, p2++) {
+    if (p1->get_type() != p2->get_type() || p1->data2 != p2->data2)
       return false;
   }

to-imperative/trunk/runtime/rf_term.hh

@@ -48 +48 @@
 friend inline Expr operator + (Term const&, Term const&) ;
 friend inline bool operator == (Term const&, Term const&) ;
-friend inline bool fast_eq (
-                Term const* _f1, Term const* _l1, Term const* _f2, Term const* _l2) ;
+friend inline bool flat_eq (
+    const Expr &_e1, uintptr_t _pos1,
+    const Expr &_e2, uintptr_t _pos2, uintptr_t _len );
 
 private: