Changeset d2034b4 for src/Common

Timestamp:

Mar 19, 2018, 5:29:23 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

f810e09

Parents:

c5ce0ec (diff), 12db9e4 (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

Location:

src/Common

Files:

• Debug.h (modified) (1 diff)
• SemanticError.h (modified) (2 diffs)

src/Common/Debug.h

@@ -28 +28 @@
 namespace Debug {
         /// debug codegen a translation unit
-        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
 
-                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
-                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });
 
                 std::cerr << "======" << label << "======" << std::endl;
-                CodeGen::generate( decls, std::cerr, false, true );
+                CodeGen::generate( decls, std::cerr, true, true );
         #endif
         } // dump
 
-        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
 
-                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
-                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });
 

src/Common/SemanticError.h

@@ -38 +38 @@
 constexpr const char * const WarningFormats[] = {
         "self assignment of expression: %s",
+        "rvalue to reference conversion of rvalue: %s",
 };
 
 enum class Warning {
         SelfAssignment,
+        RvalueToReferenceConversion,
         NUMBER_OF_WARNINGS, //This MUST be the last warning
 };
@@ -50 +52 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], __VA_ARGS__)
+// ## used here to allow empty __VA_ARGS__
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));