Changeset 154fdc8 for src/prelude/prelude.cf

Timestamp:

Apr 19, 2017, 10:15:45 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

cd348e7

Parents:

221c2de7 (diff), de4ce0e (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

File:

• src/prelude/prelude.cf (modified) (2 diffs)

src/prelude/prelude.cf

@@ -217 +217 @@
 signed int ?<?( _Bool, _Bool ),                                         ?<=?( _Bool, _Bool ),
            ?>?( _Bool, _Bool ),                                         ?>=?( _Bool, _Bool );
+signed int ?<?( char, char ),                           ?<=?( char, char ),
+           ?>?( char, char ),                           ?>=?( char, char );
+signed int ?<?( signed char, signed char ),                             ?<=?( signed char, signed char ),
+           ?>?( signed char, signed char ),                             ?>=?( signed char, signed char );
 signed int ?<?( unsigned char, unsigned char ),                         ?<=?( unsigned char, unsigned char ),
            ?>?( unsigned char, unsigned char ),                         ?>=?( unsigned char, unsigned char );
+signed int ?<?( signed short, signed short ),                           ?<=?( signed short, signed short ),
+           ?>?( signed short, signed short ),                           ?>=?( signed short, signed short );
+signed int ?<?( unsigned short, unsigned short ),                       ?<=?( unsigned short, unsigned short ),
+           ?>?( unsigned short, unsigned short ),                               ?>=?( unsigned short, unsigned short );
 signed int ?<?( signed int, signed int ),                               ?<=?( signed int, signed int ),
            ?>?( signed int, signed int ),                               ?>=?( signed int, signed int );
@@ -265 +273 @@
 
 signed int ?==?( _Bool, _Bool ),                                                        ?!=?( _Bool, _Bool );
+signed int ?==?( char, char ),                                                          ?!=?( char, char );
+signed int ?==?( signed char, signed char ),                            ?!=?( signed char, signed char );
+signed int ?==?( unsigned char, unsigned char ),                        ?!=?( unsigned char, unsigned char );
+signed int ?==?( signed short, signed short ),                          ?!=?( signed short, signed short );
+signed int ?==?( unsigned short, unsigned short ),                      ?!=?( unsigned short, unsigned short );
 signed int ?==?( signed int, signed int ),                                      ?!=?( signed int, signed int );
 signed int ?==?( unsigned int, unsigned int ),                                  ?!=?( unsigned int, unsigned int );