Thread: [X10-commits] SF.net SVN: x10:[7865] trunk (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7865
          http://x10.svn.sourceforge.net/x10/?rev=7865&view=rev
Author:   ipeshansky
Date:     2009-03-03 00:36:46 +0000 (Tue, 03 Mar 2009)

Log Message:
-----------
Fix XTENLANG-322 by adding an implementation of structural equality

Modified Paths:
--------------
    trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/MessagePassingCodeGenerator.java
    trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/SharedVarsMethods.java
    trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.cc
    trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.h
    trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.cc
    trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.h
    trunk/x10.runtime.17/src-cpp/x10/lang/Object.h
    trunk/x10.runtime.17/src-cpp/x10/lang/Ref.h
    trunk/x10.runtime.17/src-cpp/x10/lang/String.cc
    trunk/x10.runtime.17/src-cpp/x10/lang/String.h
    trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.cc
    trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.h
    trunk/x10.runtime.17/src-cpp/x10/lang/ValRail.h
    trunk/x10.runtime.17/src-cpp/x10/lang/Value.h
    trunk/x10.runtime.17/src-cpp/x10aux/basic_functions.h
    trunk/x10.runtime.17/src-cpp/x10aux/bootstrap.h
    trunk/x10.runtime.17/src-cpp/x10aux/class_cast.h

Modified: trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/MessagePassingCodeGenerator.java
===================================================================

--- trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/MessagePassingCodeGenerator.java	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/MessagePassingCodeGenerator.java	2009-03-03 00:36:46 UTC (rev 7865)
@@ -33,6 +33,8 @@
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.SERIALIZE_BODY_METHOD;
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.SERIALIZE_ID_METHOD;
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.STATIC_INIT;
+import static polyglot.ext.x10cpp.visit.SharedVarsMethods.STRUCT_EQUALS;
+import static polyglot.ext.x10cpp.visit.SharedVarsMethods.STRUCT_EQUALS_METHOD;
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.THIS;
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.VOID;
 import static polyglot.ext.x10cpp.visit.SharedVarsMethods.VOID_PTR;
@@ -181,6 +183,7 @@
 import polyglot.types.ClassType;
 import polyglot.types.CodeDef;
 import polyglot.types.CodeInstance;
+import polyglot.types.FieldInstance;
 import polyglot.types.Flags;
 import polyglot.types.InitializerInstance;
 import polyglot.types.LocalDef;
@@ -1092,12 +1095,12 @@
 				n.printBlock(member, sw, tr);
             }
 
+            X10TypeSystem xts = (X10TypeSystem) tr.typeSystem();
             // generate proxy methods for an overridden method's superclass overloads
             if (superClass != null) {
                 // first gather a set of all the method names in the current class
                 ArrayList<Name> mnames = getMethodNames(members);
 
-                X10TypeSystem xts = (X10TypeSystem) tr.typeSystem();
                 // then, for each one
                 for (Name mname : mnames) {
                     // get the list of overloads that this class should expose
@@ -1194,7 +1197,55 @@
                 }
             }
 
-			if (extractInits(currentClass, STATIC_INIT, VOID, members, true)) {
+            // Generate structEquals for values
+            if (xts.isValueType(currentClass)) {
+                h.write("public: ");
+                h.write("virtual ");
+                emitter.printType(xts.Boolean(), h);
+                h.write(" "+mangled_method_name(STRUCT_EQUALS_METHOD)+"(");
+                emitter.printType(xts.Object(), h);
+                h.write(" p0");
+                h.write(");"); h.newline();
+
+                emitter.printTemplateSignature(currentClass.typeArguments(), sw);
+                emitter.printType(xts.Boolean(), sw);
+                sw.write(" " + emitter.translateType(currentClass, false) +
+                         "::" + mangled_method_name(STRUCT_EQUALS_METHOD) + "(");
+                emitter.printType(xts.Object(), sw);
+                sw.write(" p0");
+                sw.write(") {"); sw.newline(4); sw.begin(0);
+                sw.write("if (p0.operator->() == this) return true; // short-circuit trivial equality");
+                sw.newline();
+                sw.write("if (!this->" + emitter.translateType(superClass) + "::" +
+                         mangled_method_name(STRUCT_EQUALS_METHOD) + "(p0))");
+                sw.newline(4); sw.begin(0);
+                sw.write("return false;");
+                sw.end(); sw.newline();
+                emitter.printType(currentClass, sw);
+                sw.write(" that =");
+                sw.allowBreak(4, " ");
+                sw.write("("); sw.begin(0);
+                emitter.printType(currentClass, sw);
+                sw.end(); sw.write(") p0;");
+                sw.newline();
+                for (FieldInstance fi : currentClass.fields()) {
+                    if (fi.flags().isStatic())
+                        continue;
+                    if (!xts.isValueType(fi.type()))
+                        continue;
+                    String name = fi.name().toString();
+                    sw.write("if (!"+STRUCT_EQUALS+"(this->" + mangled_field_name(name) +
+                             ", that->" + mangled_field_name(name) + "))");
+                    sw.newline(4); sw.begin(0);
+                    sw.write("return false;");
+                    sw.end(); sw.newline();
+                }
+                sw.write("return true;");
+                sw.end(); sw.newline();
+                sw.write("}"); sw.newline();
+            }
+
+            if (extractInits(currentClass, STATIC_INIT, VOID, members, true)) {
                 // define field that triggers initalisation-time registration of
                 // static init function
                 sw.write("static " + VOID_PTR + " __init__"+getUniqueId_() +

Modified: trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/SharedVarsMethods.java
===================================================================
--- trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/SharedVarsMethods.java	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/visit/SharedVarsMethods.java	2009-03-03 00:36:46 UTC (rev 7865)
@@ -78,6 +78,8 @@
 	static final String DESERIALIZE_METHOD = "_deserialize";
 	static final String DESERIALIZER_METHOD = "_deserializer";
 	static final String DESERIALIZE_BODY_METHOD = "_deserialize_body";
+    static final String STRUCT_EQUALS = "x10aux::struct_equals";
+    static final String STRUCT_EQUALS_METHOD = "_struct_equals";
 
     static final String VIM_MODELINE = "vim:tabstop=4:shiftwidth=4:expandtab";
 

Modified: trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.cc
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.cc	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.cc	2009-03-03 00:36:46 UTC (rev 7865)
@@ -22,6 +22,15 @@
     return i;
 }
 
+x10_boolean NativeInputStream::_struct_equals(ref<Object> p0) {
+    if (p0.operator->() == this) return true; // short-circuit trivial equality
+    if (!this->Value::_struct_equals(p0))
+        return false;
+//    ref<NativeInputStream> that = (ref<NativeInputStream>) p0;
+//    if (!struct_equals(this->FMGL(stream), that->FMGL(stream)))
+//        return false;
+    return true;
+}
 
 
 DEFINE_RTT(NativeInputStream);

Modified: trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/io/NativeInputStream.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -1,7 +1,7 @@
 #ifndef X10_IO_NATIVEINPUTSTREAM_H
 #define X10_IO_NATIVEINPUTSTREAM_H
 
-#include <x10/lang/Ref.h>
+#include <x10/lang/Value.h>
 
 namespace x10 {
 
@@ -11,18 +11,18 @@
 
     namespace io {
 
-        class NativeInputStream : public x10::lang::Ref {
+        class NativeInputStream : public x10::lang::Value {
             public:
             class RTT : public x10aux::RuntimeType {
                 public: 
                     static RTT* const it;
                     
                     virtual void init() {
-                        initParents(1,x10aux::getRTT<x10::lang::Ref>());
+                        initParents(1,x10aux::getRTT<x10::lang::Value>());
                     }
                     
                     virtual const char *name() const {
-                        return "x10.io.InputStreamReader.NativeInputStream";
+                        return "x10.io.InputStreamReader.InputStream";
                     }   
                     
             };
@@ -49,6 +49,8 @@
                                  x10_int off,
                                  x10_int len);
 
+            virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0);
+
             
             virtual x10_int available() { return 0; }
 

Modified: trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.cc
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.cc	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.cc	2009-03-03 00:36:46 UTC (rev 7865)
@@ -31,6 +31,16 @@
         this->write((x10_int) b->operator[](off + i));
 }
 
+x10_boolean NativeOutputStream::_struct_equals(ref<Object> p0) {
+    if (p0.operator->() == this) return true; // short-circuit trivial equality
+    if (!this->Value::_struct_equals(p0))
+        return false;
+//    ref<NativeOutputStream> that = (ref<NativeOutputStream>) p0;
+//    if (!struct_equals(this->FMGL(stream), that->FMGL(stream)))
+//        return false;
+    return true;
+}
+
 /*
 void NativeOutputStream::_printf(const char* format, ...) {
     va_list parms;

Modified: trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/io/NativeOutputStream.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -1,7 +1,7 @@
 #ifndef X10_IO_OUTPUTSTREAM_H
 #define X10_IO_OUTPUTSTREAM_H
 
-#include <x10/lang/Ref.h>
+#include <x10/lang/Value.h>
 
 namespace x10 {
 
@@ -12,18 +12,18 @@
 
     namespace io {
 
-        class NativeOutputStream : public x10::lang::Ref {
+        class NativeOutputStream : public x10::lang::Value {
             public:
             class RTT : public x10aux::RuntimeType {
                 public:
                     static RTT* const it;
 
                     virtual void init() {
-                        initParents(1,x10aux::getRTT<x10::lang::Ref>());
+                        initParents(1,x10aux::getRTT<x10::lang::Value>());
                     }
                     
                     virtual const char *name() const {
-                        return "x10.io.OutputStreamWriter.NativeOutputStream";
+                        return "x10.io.OutputStreamWriter.OutputStream";
                     }
 
             };
@@ -42,6 +42,7 @@
             virtual void write(x10aux::ref<x10::lang::Rail<x10_byte> > b, x10_int off, x10_int len);
             virtual void write(x10aux::ref<x10::lang::ValRail<x10_byte> > b, x10_int off, x10_int len);
 
+            virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0);
         };
     }
 }

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/Object.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/Object.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/Object.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -80,6 +80,12 @@
             virtual x10_int hashCode() = 0;
             virtual x10aux::ref<String> toString() = 0;
 
+            // Needed for linking - non-values should not override
+            virtual x10_boolean _struct_equals(x10aux::ref<Object> other) {
+                if (other == x10aux::ref<Object>(this)) return true;
+                return false;
+            }
+
         };
 
     }

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/Ref.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/Ref.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/Ref.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -71,10 +71,16 @@
             virtual x10aux::ref<String> toString();
 
             virtual bool equals(x10aux::ref<Object> other) {
-                if (other==x10aux::ref<Ref>(this)) return true;
+                if (other == x10aux::ref<Ref>(this)) return true;
                 return false;
             }
 
+            // Needed for linking - do not override
+            virtual x10_boolean _struct_equals(x10aux::ref<Object> other) {
+                if (other == x10aux::ref<Ref>(this)) return true;
+                return false;
+            }
+
         };
 
     }

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/String.cc
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/String.cc	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/String.cc	2009-03-03 00:36:46 UTC (rev 7865)
@@ -20,6 +20,7 @@
     return x10aux::hash(reinterpret_cast<const unsigned char*>(FMGL(content)), length());
 }
 
+// TODO: merge with _struct_equals
 x10_boolean String::equals(ref<Object> other) {
     if (!x10aux::concrete_instanceof<String>(other)) return false;
     // now we can downcast the Object to String
@@ -178,6 +179,16 @@
     return format_impl(format, ref<AnyRail<ref<Object> > >(parms));
 }
 
+x10_boolean String::_struct_equals(ref<Object> p0) {
+    if (p0.operator->() == this) return true; // short-circuit trivial equality
+    if (!this->Value::_struct_equals(p0))
+        return false;
+    ref<String> that = (ref<String>) p0;
+    if (strcmp(this->FMGL(content), that->FMGL(content)))
+        return false;
+    return true;
+}
+
 const serialization_id_t String::_serialization_id =
     DeserializationDispatcher::addDeserializer(String::_deserialize<Object>);
 

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/String.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/String.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/String.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -142,6 +142,8 @@
             static x10aux::ref<String> format(x10aux::ref<String> format,
                                               x10aux::ref<Rail<x10aux::ref<Object> > > parms);
 
+            virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0);
+
             String () : FMGL(content)(NULL) { }
             virtual ~String () {
                 x10aux::dealloc(FMGL(content));

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.cc
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.cc	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.cc	2009-03-03 00:36:46 UTC (rev 7865)
@@ -256,6 +256,23 @@
         fprintf(stderr, "\tat %s\n", (*trace)[i]->c_str());
 }
 
+x10_boolean Throwable::_struct_equals(ref<Object> p0) {
+    if (p0.operator->() == this) return true; // short-circuit trivial equality
+    if (!this->Value::_struct_equals(p0))
+        return false;
+    ref<Throwable> that = (ref<Throwable>) p0;
+    if (this->FMGL(cause) != that->FMGL(cause))
+        return false;
+    if (!x10aux::struct_equals(this->FMGL(message), that->FMGL(message)))
+        return false;
+    if (this->FMGL(trace_size) != that->FMGL(trace_size))
+        return false;
+    for (int i = 0; i < this->FMGL(trace_size); i++)
+        if (this->FMGL(trace)[i] != that->FMGL(trace)[i])
+            return false;
+    return true;
+}
 
+
 DEFINE_RTT(Throwable);
 // vim:tabstop=4:shiftwidth=4:expandtab

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/Throwable.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -85,6 +85,8 @@
             virtual StringRail getStackTrace();
             virtual void printStackTrace();
 
+            virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0);
+
             static const x10aux::serialization_id_t _serialization_id;
 
             virtual void _serialize_id(x10aux::serialization_buffer &buf, x10aux::addr_map &m) {

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/ValRail.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/ValRail.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/ValRail.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -110,14 +110,22 @@
                 return new (x10aux::alloc<Iterator>()) Iterator(this);
             }
 
-            virtual bool equals(x10aux::ref<Object> other) {
-                if (!_type()->concreteInstanceOf(other)) return false;
+            virtual x10_boolean _struct_equals(x10aux::ref<Object> other) {
+                if (other.operator->() == this) return true; // short-circuit trivial equality
+                if (!this->Value::_struct_equals(other)) return false;
                 x10aux::ref<ValRail> other_rail = other;
                 // different sizes so false
-                if (other_rail->FMGL(length)!=this->FMGL(length)) return false;
-                for (x10_int index=0 ; index<this->FMGL(length) ; ++index) {
-                    if ((*other_rail)[index]!=this->raw()[index])
-                        return false;
+                if (other_rail->FMGL(length) != this->FMGL(length)) return false;
+                if (x10aux::getRTT<T>()->subtypeOf(x10aux::getRTT<Value>())) {
+                    // Value type; structurally compare elements
+                    for (x10_int i = 0; i < this->FMGL(length); ++i)
+                        if (!x10aux::struct_equals((*other_rail)[i], this->raw()[i]))
+                            return false;
+                } else {
+                    // Ref type; simple reference equality
+                    for (x10_int i = 0; i < this->FMGL(length); ++i)
+                        if ((*other_rail)[i] != this->raw()[i])
+                            return false;
                 }
                 return true;
             }

Modified: trunk/x10.runtime.17/src-cpp/x10/lang/Value.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10/lang/Value.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10/lang/Value.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -70,7 +70,13 @@
             virtual x10aux::ref<String> toString();
 
             virtual x10_boolean equals(x10aux::ref<Object> other) {
-                if (!x10aux::concrete_instanceof<Value>(other)) return false;
+                if (!x10aux::instanceof<Value>(other)) return false;
+                return this->_struct_equals(other);
+            }
+
+            virtual x10_boolean _struct_equals(x10aux::ref<Object> other) {
+                if (!_type()->concreteInstanceOf(other))
+                    return false;
                 // now compare fields but there aren't any
                 return true;
             }

Modified: trunk/x10.runtime.17/src-cpp/x10aux/basic_functions.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10aux/basic_functions.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10aux/basic_functions.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -84,7 +84,52 @@
     static inline x10_boolean equals(const x10_char x,    const x10_char y)    { return x==y; }
     static inline x10_boolean equals(const x10_boolean x, const x10_boolean y) { return x==y; }
 
+    template<class T, class U>
+    static inline x10_boolean struct_equals(ref<T> x, ref<U> y) { return x->_struct_equals(y); }
 
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_double y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_float y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_long y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_int y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_short y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_byte y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_char y) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(ref<T> x, x10_boolean y) { return false; }
+
+    template<class T>
+    static inline x10_boolean struct_equals(x10_double y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_float y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_long y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_int y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_short y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_byte y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_char y, ref<T> x) { return false; }
+    template<class T>
+    static inline x10_boolean struct_equals(x10_boolean y, ref<T> x) { return false; }
+
+    static inline x10_boolean struct_equals(const x10_double x,  const x10_double y)  { return x==y; }
+    static inline x10_boolean struct_equals(const x10_float x,   const x10_float y)   { return x==y; }
+    static inline x10_boolean struct_equals(const x10_long x,    const x10_long y)    { return x==y; }
+    static inline x10_boolean struct_equals(const x10_int x,     const x10_int y)     { return x==y; }
+    static inline x10_boolean struct_equals(const x10_short x,   const x10_short y)   { return x==y; }
+    static inline x10_boolean struct_equals(const x10_byte x,    const x10_byte y)    { return x==y; }
+    static inline x10_boolean struct_equals(const x10_char x,    const x10_char y)    { return x==y; }
+    static inline x10_boolean struct_equals(const x10_boolean x, const x10_boolean y) { return x==y; }
+
     template<class T> static inline x10_int hash_code(ref<T> x) {
         return x->hashCode();
     }

Modified: trunk/x10.runtime.17/src-cpp/x10aux/bootstrap.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10aux/bootstrap.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10aux/bootstrap.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -44,6 +44,9 @@
           : main(main_), args(args_)
         { }
 
+        virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0) {
+            return false; // FIXME: should we be able to compare function types structurally?
+        }
 
         const x10aux::RuntimeType *_type() const {return x10aux::getRTT<x10::lang::VoidFun_0_0>();}
 
@@ -62,7 +65,7 @@
         try {
 #endif
             setlinebuf(stdout);
-			
+
             x10aux::barrier();
 
             // Initialise enough state to make this 'main' thread look like a normal x10 thread

Modified: trunk/x10.runtime.17/src-cpp/x10aux/class_cast.h
===================================================================
--- trunk/x10.runtime.17/src-cpp/x10aux/class_cast.h	2009-03-02 15:43:22 UTC (rev 7864)
+++ trunk/x10.runtime.17/src-cpp/x10aux/class_cast.h	2009-03-03 00:36:46 UTC (rev 7865)
@@ -156,6 +156,7 @@
         ValueBox(T v_) : v(v_) { }
         virtual x10_int hashCode() { return x10aux::hash_code(v); }
         virtual x10_boolean equals(x10aux::ref<Object> other) { return x10aux::equals(v, other); }
+        virtual x10_boolean _struct_equals(x10aux::ref<x10::lang::Object> p0) { return x10aux::struct_equals(v, p0); }
         virtual ref<x10::lang::String> toString() { return x10aux::to_string(v); }
     };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [X10-commits] SF.net SVN: x10:[7865] trunk (Page 2)

Performance and Productivity at Scale

x10-commits