Changeset 7c9ac4a

Timestamp:

Nov 18, 2020, 4:49:09 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f9b2e73

Parents:

69d1748 (diff), b4130f9 (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:

• .gitignore (modified) (1 diff)
• doc/theses/andrew_beach_MMath/cfalab.sty (modified) (1 diff)
• doc/theses/andrew_beach_MMath/future.tex (added)
• driver/cc1.cc (modified) (2 diffs)
• driver/cfa.cc (modified) (2 diffs)
• tests/.expect/manipulatorsOutput2.arm64.txt (added)
• tests/manipulatorsOutput2.cfa (modified) (2 diffs)

.gitignore

@@ -48 +48 @@
 libcfa/x64-debug/
 libcfa/x64-nodebug/
-libcfa/x64-nolib/
 libcfa/x86-debug/
 libcfa/x86-nodebug/
-libcfa/x86-nolib/
-libcfa/arm-debug/
-libcfa/arm-nodebug/
-libcfa/arm-nolib/
+libcfa/arm64-debug/
+libcfa/arm64-nodebug/
 
 # generated by bison and lex from parser.yy and lex.ll

doc/theses/andrew_beach_MMath/cfalab.sty

@@ -72 +72 @@
     \renewcommand\textunderscore{\csuse{cfalab@textunderscore@#1}}}
 
+% This is executed very early in the \begin{document} code.
+\AtEndPreamble{
+  \@ifpackageloaded{hyperref}{
+    % Convert symbols to pdf compatable forms when required.
+    \pdfstringdefDisableCommands{
+      \def\CFA{CFA}
+    }
+  }{}
+}
+
 \endinput

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug 16 21:03:02 2020
-// Update Count     : 413
+// Last Modified On : Tue Nov 17 14:27:08 2020
+// Update Count     : 414
 //
 
@@ -97 +97 @@
                         } else if ( val == "-CFA" ) {
                                 CFA_flag = true;
-                        } else if ( val == "-save-temps" ) {
+                        } else if ( val == "-save-temps" || val == "--save-temps" ) {
                                 save_temps = true;
                         } else if ( prefix( val, "-o=" ) ) {            // output file for -CFA

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep  2 17:59:20 2020
-// Update Count     : 438
+// Last Modified On : Tue Nov 17 14:27:28 2020
+// Update Count     : 440
 //
 
@@ -231 +231 @@
                                 debugging = true;                                               // symbolic debugging required
                                 args[nargs++] = argv[i];                                // pass flag along
-                        } else if ( arg == "-save-temps" ) {
+                        } else if ( arg == "-save-temps" || arg == "--save-temps" ) {
                                 args[nargs++] = argv[i];                                // pass flag along
                                 Putenv( argv, arg );                                    // save cfa-cpp output

tests/manipulatorsOutput2.cfa

@@ -7 +7 @@
 // Created On       : Sat Jun  8 18:04:11 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 10 12:37:57 2019
-// Update Count     : 8
+// Last Modified On : Sun Nov 15 08:11:53 2020
+// Update Count     : 9
 // 
 
@@ -52 +52 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa -Wall -Wextra amanipulatorsOutput2.cfa" //
+// compile-command: "cfa -Wall -Wextra manipulatorsOutput2.cfa" //
 // End: //