Changeset ff178ee

Timestamp:

Apr 12, 2017, 4:34:18 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0d10090, 549950c

Parents:

e869e434

Message:

add relational operators for char and short to prelude

Files:

• doc/generic_types/evaluation/cfa-bench.c (modified) (2 diffs)
• src/prelude/prelude.cf (modified) (2 diffs)

doc/generic_types/evaluation/cfa-bench.c

@@ -27 +27 @@
         )
 
-        stack(pair(_Bool, unsigned char)) s2;
+        stack(pair(_Bool, char)) s2;
         REPEAT_TIMED( "push_bool_char",
-                push( &s2, (pair(_Bool, unsigned char)){ rand() & 0x1, rand() & 0x7F } );
+                push( &s2, (pair(_Bool, char)){ rand() & 0x1, rand() & 0x7F } );
         )
 
-        stack(pair(_Bool, unsigned char)) t2;
+        stack(pair(_Bool, char)) t2;
         TIMED( "copy_bool_char", 
                 t2 = s2;
@@ -41 +41 @@
         )
 
-        pair(_Bool, unsigned char) max2 = { (_Bool)0, '\0' };
+        pair(_Bool, char) max2 = { (_Bool)0, '\0' };
         REPEAT_TIMED( "pop_bool_char",
                 max2 = max( max2, pop( &t2 ) );

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 );