Changeset 873

Timestamp:

Jun 26, 2003, 1:16:21 PM (18 years ago)

Author:

orlov

Message:

• Method Expr::compare.

Location:

to-imperative/trunk/runtime

Files:

• rf_expr.hh (modified) (1 diff)
• rf_expr.ih (modified) (1 diff)
• rf_term.cc (modified) (2 diffs)
• rf_term.hh (modified) (2 diffs)
• rf_term.ih (modified) (2 diffs)

to-imperative/trunk/runtime/rf_expr.hh

@@ -186 +186 @@
   inline bool operator == (Expr const& _expr) const ;
   inline bool operator != (Expr const& _expr) const ;
+  ///
+  /// Compare two expressions.  Return 1 if first expression is larger then
+  /// second one, 0 if they are equal, and -1 if first one is smaller then
+  /// second one.
+  static inline int compare (Expr const& _expr1, Expr const& _expr2) ;
   ///
   /// Get pointer to a memory block containing an expression

to-imperative/trunk/runtime/rf_expr.ih

@@ -437 +437 @@
 {
   return !(self == _expr);
+}
+
+inline int Expr::compare (Expr const& _expr1, Expr const& _expr2)
+{
+  return Term::compare(_expr1.get_first(), _expr1.get_last(),
+                       _expr2.get_first(), _expr2.get_last());
 }
 

to-imperative/trunk/runtime/rf_term.cc

@@ -75 +75 @@
 }
 
+int Term::ref_compare (Term const* _term1, Term const* _term2)
+{
+  return compare(_term1->get_first(), _term1->get_last(),
+                 _term2->get_first(), _term2->get_last());
+}
+
 //
 // FIXME: implement this
@@ -86 +92 @@
   (void (*)(Term*))(Term::ref_dtor),
   (bool (*)(Term const*, Term const*))(Term::ref_eq),
-  null, // (int (*)(Term const*, Term const*))(ref_compare), FIXME:
+  (int  (*)(Term const*, Term const*))(Term::ref_compare),
   null, // (uint32_t (*)(Term const*))(ref_hash), FIXME:
   (pxx::WString (*)(Term const*))(Term::ref_to_string)

to-imperative/trunk/runtime/rf_term.hh

@@ -139 +139 @@
   static void ref_dtor (Term* _term) ;
   static bool ref_eq (Term const* _term1, Term const* _term2) ;
+  static int ref_compare (Term const* _term1, Term const* _term2) ;
   static pxx::WString ref_to_string (Term const* _term) ;
   static short_type_funcs_t ref_funcs ;
@@ -206 +207 @@
 
   inline operator pxx::WString () const ;
+
+  static inline int compare (Term const& _t1, Term const& _t2) ;
+  static inline int compare (
+    Term const* _f1, Term const* _l1, Term const* _f2, Term const* _l2
+  ) ;
 
 #if defined(RF_STORE_CHUNK_ORDER_IN_TERM)

to-imperative/trunk/runtime/rf_term.ih

@@ -132 +132 @@
 inline bool Term::operator == (Term const& _t) const
 {
+  if (is_ref() && _t.is_ref()) return ref_eq(this, &_t);
   if (data1 != _t.data1) return false;
   if (uint_data2 == _t.uint_data2) return true;
-  bool (*pf)(Term const*, Term const*) = short_type_funcs[get_type()]->eq;
+  bool (*pf)(Term const*, Term const*) = short_type_funcs[get_short_type()]->eq;
   if (pf && (*pf)(this, &_t)) return true;
   return false;
@@ -210 +211 @@
 inline Term::operator pxx::WString () const
 {
-  return (*(short_type_funcs[get_type()]->to_string))(this);
+  return (*(short_type_funcs[get_short_type()]->to_string))(this);
+}
+
+inline int Term::compare (Term const& _t1, Term const& _t2)
+{
+  unsigned type1 = _t1.get_short_type();
+  unsigned type2 = _t2.get_short_type();
+  if (type1 == type_ref && type2 != type_ref) return 1;
+  if (type1 != type_ref && type2 == type_ref) return -1;
+  if (type1 > type2) return 1;
+  if (type1 < type2) return -1;
+  int (*cmp)(Term const*, Term const*) = short_type_funcs[type1]->compare;
+  if (cmp) return (*cmp)(&_t1, &_t2);
+  if (_t1.uint_data2 > _t2.uint_data2) return 1;
+  if (_t1.uint_data2 < _t2.uint_data2) return -1;
+  return 0;
+}
+
+inline int Term::compare (
+  Term const* _f1, Term const* _l1, Term const* _f2, Term const* _l2
+)
+{
+  uintptr_t len1 = _l1 - _f1;
+  uintptr_t len2 = _l2 - _f2;
+  int compare_len = -1;
+  uintptr_t min_len = len1;
+  if (len1 > len2)
+  {
+    compare_len = 1;
+    min_len = len2;
+  }
+  else if (len1 == len2)
+  {
+    compare_len = 0;
+  }
+  for (; min_len; min_len--)
+  {
+    int res = Term::compare(*_f1++, *_f2++);
+    if (res) return res;
+  }
+  return compare_len;
 }