Changeset 31f4837 for src/Common

Timestamp:

May 13, 2024, 10:26:59 AM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

e6f1a4b

Parents:

acb33f15 (diff), ca4f2b2 (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

Location:

src/Common

Files:

• Assert.cpp (moved) (moved from src/Common/Assert.cc ) (2 diffs)
• CodeLocation.hpp (moved) (moved from src/Common/CodeLocation.h ) (1 diff)
• CodeLocationTools.cpp (modified) (1 diff)
• DebugMalloc.cpp (moved) (moved from src/Common/DebugMalloc.cc )
• DeclStats.cpp (modified) (1 diff)
• ErrorObjects.hpp (moved) (moved from src/Common/ErrorObjects.h ) (2 diffs)
• Eval.cpp (moved) (moved from src/Common/Eval.cc ) (2 diffs)
• Eval.hpp (moved) (moved from src/Common/Eval.h ) (1 diff)
• Examine.cpp (moved) (moved from src/Common/Examine.cc ) (3 diffs)
• Examine.hpp (moved) (moved from src/Common/Examine.h ) (1 diff)
• FilterCombos.hpp (moved) (moved from src/Common/FilterCombos.h ) (2 diffs)
• Indenter.cpp (moved) (moved from src/Common/Indenter.cc ) (2 diffs)
• Indenter.hpp (moved) (moved from src/Common/Indenter.h ) (1 diff)
• PersistentMap.hpp (moved) (moved from src/Common/PersistentMap.h ) (1 diff)
• ResolvProtoDump.cpp (modified) (1 diff)
• ScopedMap.hpp (moved) (moved from src/Common/ScopedMap.h ) (1 diff)
• SemanticError.cpp (moved) (moved from src/Common/SemanticError.cc ) (3 diffs)
• SemanticError.hpp (moved) (moved from src/Common/SemanticError.h ) (2 diffs)
• Stats.hpp (moved) (moved from src/Common/Stats.h ) (3 diffs)
• Stats/Base.hpp (moved) (moved from src/Common/Stats/Base.h ) (1 diff)
• Stats/Counter.cpp (moved) (moved from src/Common/Stats/Counter.cc ) (2 diffs)
• Stats/Counter.hpp (moved) (moved from src/Common/Stats/Counter.h ) (2 diffs)
• Stats/Heap.cpp (moved) (moved from src/Common/Stats/Heap.cc ) (3 diffs)
• Stats/Heap.hpp (moved) (moved from src/Common/Stats/Heap.h ) (1 diff)
• Stats/ResolveTime.cpp (moved) (moved from src/Common/Stats/ResolveTime.cc ) (2 diffs)
• Stats/ResolveTime.hpp (moved) (moved from src/Common/Stats/ResolveTime.h ) (2 diffs)
• Stats/Stats.cpp (moved) (moved from src/Common/Stats/Stats.cc ) (1 diff)
• Stats/Time.cpp (moved) (moved from src/Common/Stats/Time.cc ) (2 diffs)
• Stats/Time.hpp (moved) (moved from src/Common/Stats/Time.h ) (2 diffs)
• UniqueName.cpp (moved) (moved from src/Common/UniqueName.cc ) (2 diffs)
• UniqueName.hpp (moved) (moved from src/Common/UniqueName.h ) (1 diff)
• Utility.hpp (moved) (moved from src/Common/utility.h ) (1 diff)
• VectorMap.hpp (moved) (moved from src/Common/VectorMap.h ) (1 diff)
• module.mk (modified) (1 diff)

src/Common/Assert.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Assert.cc --
+// Assert.cpp --
 //
 // Author           : Peter A. Buhr
@@ -22 +22 @@
 #define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
-// called by macro assert in assert.h
+// called by macro assert in cassert
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
         fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );

src/Common/CodeLocation.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeLocation.h --
+// CodeLocation.hpp --
 //
 // Author           : Andrew Beach

src/Common/CodeLocationTools.cpp

@@ -20 +20 @@
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 namespace {

src/Common/DeclStats.cpp

@@ -19 +19 @@
 #include "AST/Pass.hpp"
 #include "AST/Print.hpp"
-#include "Common/VectorMap.h"
+#include "Common/VectorMap.hpp"
 
 #include <iostream>

src/Common/ErrorObjects.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ErrorObjects.h --
+// ErrorObjects.hpp --
 //
 // Author           : Thierry Delisle
@@ -23 +23 @@
 #include <unistd.h>     // for isatty
 
-#include "CodeLocation.h"                                                               // for CodeLocation, toString
+#include "CodeLocation.hpp"                                                             // for CodeLocation, toString
 
 struct error {

src/Common/Eval.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Eval.cc -- Evaluate parts of the ast at compile time.
+// Eval.cpp -- Evaluate parts of the ast at compile time.
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "Eval.h"
+#include "Eval.hpp"
 
 #include <utility> // for pair
 
 #include "AST/Inspect.hpp"
-#include "CodeGen/OperatorTable.h"                                              // access: OperatorInfo
+#include "CodeGen/OperatorTable.hpp"                                            // access: OperatorInfo
 #include "AST/Pass.hpp"
-#include "InitTweak/InitTweak.h"
+#include "InitTweak/InitTweak.hpp"
 
 struct EvalNew : public ast::WithShortCircuiting {

src/Common/Eval.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Eval.h -- Evaluate parts of the ast at compile time.
+// Eval.hpp -- Evaluate parts of the ast at compile time.
 //
 // Author           : Andrew Beach

src/Common/Examine.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Examine.cc -- Helpers for examining AST code.
+// Examine.cpp -- Helpers for examining AST code.
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
-#include "Common/Examine.h"
+#include "Common/Examine.hpp"
 
 #include "AST/Type.hpp"
-#include "CodeGen/OperatorTable.h"
-#include "InitTweak/InitTweak.h"
+#include "CodeGen/OperatorTable.hpp"
+#include "InitTweak/InitTweak.hpp"
 
 namespace {
@@ -55 +55 @@
 const ast::Type * getDestructorParam( const ast::FunctionDecl * func ) {
         if ( !CodeGen::isDestructor( func->name ) ) return nullptr;
-        //return InitTweak::getParamThis( func )->type;
         return getTypeofThisSolo( func );
 }

src/Common/Examine.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Examine.h -- Helpers for examining AST code.
+// Examine.hpp -- Helpers for examining AST code.
 //
 // Author           : Andrew Beach

src/Common/FilterCombos.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FilterCombos.h --
+// FilterCombos.hpp --
 //
 // Author           : Aaron B. Moss
@@ -22 +22 @@
 
 /// Combo iterator that simply collects values into a vector, marking all values as valid.
-/// Prefer combos in typeops.h to use of IntoVectorComboIter with filterCombos
+/// Prefer combos in Typeops.hpp to use of IntoVectorComboIter with filterCombos
 /// @param T    The element type of the vector.
 template<typename T>

src/Common/Indenter.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indenter.cc --
+// Indenter.cpp --
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
-#include "Indenter.h"
+#include "Indenter.hpp"
 
 unsigned Indenter::tabsize = 2;

src/Common/Indenter.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indenter.h --
+// Indenter.hpp --
 //
 // Author           : Rob Schluntz

src/Common/PersistentMap.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PersistentMap.h --
+// PersistentMap.hpp --
 //
 // Author           : Aaron B. Moss

src/Common/ResolvProtoDump.cpp

@@ -26 +26 @@
 #include "AST/TranslationUnit.hpp"
 #include "AST/Type.hpp"
-#include "CodeGen/OperatorTable.h"
+#include "CodeGen/OperatorTable.hpp"
 
 namespace {

src/Common/ScopedMap.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScopedMap.h --
+// ScopedMap.hpp --
 //
 // Author           : Aaron B. Moss

src/Common/SemanticError.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.cc --
+// SemanticError.cpp --
 //
 // Author           : Thierry Delisle
@@ -13 +13 @@
 // Update Count     : 34
 //
+
+#include "SemanticError.hpp"
 
 #include <cstdarg>
@@ -23 +25 @@
 #include <vector>
 
+#include "Common/Utility.hpp"                                                   // for to_string, CodeLocation (ptr only)
+
 using namespace std;
-
-#include "Common/utility.h"                                                             // for to_string, CodeLocation (ptr only)
-#include "SemanticError.h"
 
 //-----------------------------------------------------------------------------

src/Common/SemanticError.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.h --
+// SemanticError.hpp --
 //
 // Author           : Thierry Delisle
@@ -16 +16 @@
 #pragma once
 
-#include "ErrorObjects.h"
+#include "ErrorObjects.hpp"
 #include "AST/Node.hpp"
 #include "AST/ParseNode.hpp"

src/Common/Stats.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Stats.h --
+// Stats.hpp --
 //
 // Author           : Thierry Delisle
@@ -24 +24 @@
 
 These can be enabled using the --stats option, to which a comma seperated list of options can be passed.
-For more details see Stats.cc
+For more information, see Stats/Stats.cpp
 
 Counters:
@@ -40 +40 @@
 
 
-#include "Common/Stats/Counter.h"
-#include "Common/Stats/Heap.h"
-#include "Common/Stats/Time.h"
+#include "Common/Stats/Counter.hpp"
+#include "Common/Stats/Heap.hpp"
+#include "Common/Stats/Time.hpp"
 
 namespace Stats {

src/Common/Stats/Base.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Heap.hpp --
 //
 // Author           : Thierry Delisle

src/Common/Stats/Counter.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Counter.cc --
+// Counter.cpp --
 //
 // Author           : Thierry Delisle
@@ -14 +14 @@
 //
 
-#include "Counter.h"
+#include "Counter.hpp"
 
 #include <algorithm>

src/Common/Stats/Counter.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Counter.h --
+// Counter.hpp --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include <iostream>
 
-#include "Common/Stats/Base.h"
+#include "Common/Stats/Base.hpp"
 
 #if defined( NO_STATISTICS )

src/Common/Stats/Heap.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.cc --
+// Heap.cpp --
 //
 // Author           : Thierry Delisle
@@ -69 +69 @@
                 void stacktrace_push(size_t id) {
                         ++stacktrace_depth;
-                        assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cc");
+                        assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cpp");
                         trace[stacktrace_depth] = id;
                 }
@@ -87 +87 @@
                         passes_cnt++;
 
-                        assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cc");
+                        assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cpp");
                 }
 

src/Common/Stats/Heap.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Heap.hpp --
 //
 // Author           : Thierry Delisle

src/Common/Stats/ResolveTime.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTime.cc --
+// ResolveTime.cpp --
 //
 // Author           : Thierry Delisle
@@ -14 +14 @@
 //
 
-#include "ResolveTime.h"
+#include "ResolveTime.hpp"
 
 #include <fstream>

src/Common/Stats/ResolveTime.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ResolveTime.h --
+// ResolveTime.hpp --
 //
 // Author           : Thierry Delisle
@@ -16 +16 @@
 #pragma once
 
-#include "Common/Stats/Base.h"
+#include "Common/Stats/Base.hpp"
 
 #if defined( NO_STATISTICS )

src/Common/Stats/Stats.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Stats.cc --
+// Stats.cpp --
 //
 // Author           : Thierry Delisle

src/Common/Stats/Time.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Time.cc --
+// Time.cpp --
 //
 // Author           : Thierry Delisle
@@ -14 +14 @@
 //
 
-#include "Time.h"
+#include "Time.hpp"
 
 #include <cassert>

src/Common/Stats/Time.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Time.h --
+// Time.hpp --
 //
 // Author           : Thierry Delisle
@@ -16 +16 @@
 #pragma once
 
-#include "Common/Stats/Base.h"
+#include "Common/Stats/Base.hpp"
 
 #if defined( NO_STATISTICS )

src/Common/UniqueName.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// UniqueName.cc -- Create a unique variants of a base name with a counter.
+// UniqueName.cpp -- Create a unique variants of a base name with a counter.
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
-#include "UniqueName.h"
+#include "UniqueName.hpp"
 
 #include "Common/ToString.hpp"

src/Common/UniqueName.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// UniqueName.h -- Create a unique variants of a base name with a counter.
+// UniqueName.hpp -- Create a unique variants of a base name with a counter.
 //
 // Author           : Richard C. Bilson

src/Common/Utility.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h -- General utilities used across the compiler.
+// Utility.hpp -- General utilities used across the compiler.
 //
 // Author           : Richard C. Bilson

src/Common/VectorMap.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// VectorMap.h --
+// VectorMap.hpp --
 //
 // Author           : Aaron B. Moss

src/Common/module.mk

@@ -16 +16 @@
 
 SRC_COMMON = \
-        Common/Assert.cc \
-        Common/CodeLocation.h \
+        Common/Assert.cpp \
+        Common/CodeLocation.hpp \
         Common/CodeLocationTools.hpp \
         Common/CodeLocationTools.cpp \
         Common/DeclStats.hpp \
         Common/DeclStats.cpp \
-        Common/ErrorObjects.h \
-        Common/Eval.cc \
-        Common/Eval.h \
-        Common/Examine.cc \
-        Common/Examine.h \
-        Common/FilterCombos.h \
-        Common/Indenter.h \
-        Common/Indenter.cc \
+        Common/ErrorObjects.hpp \
+        Common/Eval.cpp \
+        Common/Eval.hpp \
+        Common/Examine.cpp \
+        Common/Examine.hpp \
+        Common/FilterCombos.hpp \
+        Common/Indenter.hpp \
+        Common/Indenter.cpp \
         Common/Iterate.hpp \
-        Common/PersistentMap.h \
+        Common/PersistentMap.hpp \
         Common/ResolvProtoDump.hpp \
         Common/ResolvProtoDump.cpp \
-        Common/ScopedMap.h \
-        Common/SemanticError.cc \
-        Common/SemanticError.h \
-        Common/Stats.h \
-        Common/Stats/Base.h \
-        Common/Stats/Counter.cc \
-        Common/Stats/Counter.h \
-        Common/Stats/Heap.cc \
-        Common/Stats/Heap.h \
-        Common/Stats/ResolveTime.cc \
-        Common/Stats/ResolveTime.h \
-        Common/Stats/Stats.cc \
-        Common/Stats/Time.cc \
-        Common/Stats/Time.h \
+        Common/ScopedMap.hpp \
+        Common/SemanticError.cpp \
+        Common/SemanticError.hpp \
+        Common/Stats.hpp \
+        Common/Stats/Base.hpp \
+        Common/Stats/Counter.cpp \
+        Common/Stats/Counter.hpp \
+        Common/Stats/Heap.cpp \
+        Common/Stats/Heap.hpp \
+        Common/Stats/ResolveTime.cpp \
+        Common/Stats/ResolveTime.hpp \
+        Common/Stats/Stats.cpp \
+        Common/Stats/Time.cpp \
+        Common/Stats/Time.hpp \
         Common/ToString.hpp \
-        Common/UniqueName.cc \
-        Common/UniqueName.h \
-        Common/utility.h \
-        Common/VectorMap.h
+        Common/UniqueName.cpp \
+        Common/UniqueName.hpp \
+        Common/Utility.hpp \
+        Common/VectorMap.hpp
 
 SRC += $(SRC_COMMON) \
-        Common/DebugMalloc.cc
+        Common/DebugMalloc.cpp
 
 SRCDEMANGLE += $(SRC_COMMON)