Changeset 79e23836

Timestamp:

Mar 14, 2021, 10:04:10 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

34d62a7

Parents:

5f39135 (diff), 4c05a40 (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

Files:

• libcfa/src/heap.cfa (modified) (2 diffs)
• libcfa/src/stdhdr/sys/socket.h (added)
• tests/include/.expect/includes.nast.txt (modified) (1 diff)
• tests/include/includes.cfa (modified) (11 diffs)

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 10 11:20:49 2021
-// Update Count     : 1031
+// Last Modified On : Sun Mar 14 10:39:24 2021
+// Update Count     : 1032
 //
 
@@ -52 +52 @@
 static bool prtFree = false;
 
-inline bool prtFree() {
+bool prtFree() {
         return prtFree;
 } // prtFree

tests/include/.expect/includes.nast.txt

@@ -2 +2 @@
 /usr/include/x86_64-linux-gnu/bits/socket.h:285:44: note: the ABI of passing struct with a flexible array member has changed in GCC 4.4
 include/includes.cfa: In function '_X4mainFi_iPPKc__1':
-include/includes.cfa:186:9: note: #pragma message: Compiled
+include/includes.cfa:154:9: note: #pragma message: Compiled

tests/include/includes.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Includes.cfa -- 
+// includes.cfa -- 
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  2 15:03:40 2021
-// Update Count     : 690
+// Last Modified On : Sun Mar 14 10:18:26 2021
+// Update Count     : 746
 //
 
@@ -19 +19 @@
 
 //#define _GNU_SOURCE
-//#include <FlexLexer.h>
 #include <aio.h>
 #include <aliases.h>
@@ -33 +32 @@
 #include <ctype.h>
 #include <curses.h>
-//#include <cursesapp.h>
-//#include <cursesf.h>
-//#include <cursesm.h>
-//#include <cursesp.h>
-//#include <cursesw.h>
-//#include <cursslk.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <elf.h>
-//#include <emacs-module.h>                                                             // may not be installed
 #include <endian.h>
 #include <envz.h>
@@ -49 +41 @@
 #include <error.h>
 #include <eti.h>
-//#include <etip.h>
 #include <execinfo.h>
-//#include <expat.h>                                                                            // 32-bit attribute-location problem
+//#include <expat.h>                                                                    // 32-bit attribute-location problem
 #include <expat_external.h>
 #include <fcntl.h>
@@ -67 +58 @@
 #include <getopt.h>
 #include <glob.h>
-//#include <gmpxx.h>
 #include <gnumake.h>
 #include <gnu-versions.h>
@@ -82 +72 @@
 //#include <link.h>                                                                             // CFA bug #240 nested anonymous enum fails
 #include <locale.h>
-//#include <ltdl.h>
-//#include <lzma.h>                                                                             // may not be installed
-//#include <malloc.h>                                                                           // CFA #include_next
+#include <ltdl.h>
+//#include <malloc.h>                                                                   // cannot include in extern "C" because of CFA #include_next
 #include <math.h>
 #include <mcheck.h>
@@ -91 +80 @@
 #include <mntent.h>
 #include <monetary.h>
-#include <mpath_cmd.h>
-#include <mpath_persist.h>
 #include <mqueue.h>
 #include <ncurses_dll.h>
-//#include <nc_tparm.h>
 #include <netdb.h>
 #include <nl_types.h>
@@ -109 +95 @@
 #include <pwd.h>
 #include <regex.h>
-//#include <regexp.h>
 #include <resolv.h>
 #include <re_comp.h>
@@ -139 +124 @@
 #include <term_entry.h>
 #include <tgmath.h>
-#include <threads.h>
+//#include <threads.h>                                                                  // does not exist
 #include <thread_db.h>
-//#include <tic.h>
 #include <time.h>
 #include <ttyent.h>
@@ -157 +141 @@
 #include <wctype.h>
 #include <wordexp.h>
-#include <z3.h>
-//#include <z3++.h>
-#include <z3_algebraic.h>
-#include <z3_api.h>
-#include <z3_ast_containers.h>
-#include <z3_fixedpoint.h>
-#include <z3_fpa.h>
-#include <z3_macros.h>
-#include <z3_optimization.h>
-#include <z3_polynomial.h>
-#include <z3_rcf.h>
-#include <z3_spacer.h>
-//#include <z3_v1.h>
-#include <z3_version.h>
-#include <zconf.h>
-#include <zlib.h>
 
 #if 0
@@ -187 +155 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa Includes.cfa" //
+// compile-command: "cfa includes.cfa" //
 // End: //