Changeset 21eb693 for src/tests/Operators.c

Timestamp:

Jun 20, 2016, 3:05:35 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

554a0db

Parents:

a0dcd2e (diff), 0a346e5 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/tests/Context.c

File:

• src/tests/Operators.c (modified) (3 diffs)

src/tests/Operators.c

@@ -1 @@
-int ?*?( int, int );
+int ?*?( int a, int b ) {
+        return 0;
+}
 
 int ?()( int number1, int number2 ) {
@@ -5 +7 @@
 }
 
-int ?+?( int, int );
+int ?+?( int a, int b ) {
+        return 0;
+}
 
-int ?=?( int *, int );
+int ?=?( int *a, int b ) {
+        return 0;
+}
 struct accumulator {
         int total;
 };
 
-char ?()( struct accumulator a, char number1, char number2 );
+char ?()( struct accumulator a, char number1, char number2 ) {
+        return 'a';
+}
 
 void f( void ) {
@@ -23 +31 @@
 }
 
+int main(int argc, char const *argv[]) {
+        /* code */
+        return 0;
+}
+
 // Local Variables: //
 // tab-width: 4 //