Changeset 12c1eef for libcfa/src/parseconfig.cfa

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (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:

• libcfa/src/parseconfig.cfa (modified) (3 diffs)

libcfa/src/parseconfig.cfa

@@ +1 @@
+
+
+#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wunused-parameter"
+//#pragma GCC diagnostic ignored "-Wunused-function"
+//#pragma GCC diagnostic ignored "-Wuninitialized"
+//#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+
 #include <fstream.hfa>
 #include <parseargs.hfa>
@@ -19 +27 @@
 // TODO: use string interface when it's ready (and implement exception msg protocol)
 [ void ] msg( * Missing_Config_Entries ex ) {
-        serr | nlOff;
-        serr | "The config file is missing " | ex->num_missing;
-        serr | nlOn;
-        if ( ex->num_missing == 1 ) {
-                serr | " entry.";
-        } else {
-                serr | " entries.";
-        }
+        serr | "The config file is missing " | ex->num_missing | "entr" | sepOff | (ex->num_missing == 1 ? "y." : "ies.");
 } // msg
 
@@ -223 +224 @@
         return value < zero_val;
 }
+#pragma GCC diagnostic pop