Changeset 4117761 for libcfa

Timestamp:

Jun 29, 2024, 5:02:49 AM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

115ac1ce

Parents:

5ccc733 (diff), 3c55fcd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• enum.cfa (modified) (2 diffs)
• enum.hfa (modified) (2 diffs)

libcfa/src/enum.cfa

@@ -6 +6 @@
 forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
         ostype & ?|?( ostype& os, E e ) {
-//              if ( scoped( e ) ) os | type_name( e ) | '.' | nonl;
                 return os | label( e );
         }
@@ -12 +11 @@
 }
 
-// forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-// ostype & ?|?( ostype & os, E e ) {
-// //    return os | type_name(e) | "." | label(e);
-//     return os | label( e );
-// }
+forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
+ostype & ?|?( ostype & os, E e ) {
+    return os | label( e );
+}
 
 forall( E, V | CfaEnum(E, V) ) {                                                // relational operators

libcfa/src/enum.hfa

@@ -20 +20 @@
     unsigned int posn( E e );
     V value( E e );
-    char * type_name( E e );
-//    bool scoped( E e );
 };
 
@@ -31 +29 @@
 }
 
-//forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-//ostype & ?|?( ostype &, E );
+forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
+ostype & ?|?( ostype &, E );
 
 // Design two <- should go for this if we have change the cost model