Changeset 083e637

Timestamp:

May 7, 2024, 4:45:53 PM (7 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

07e9df1, 0b6c1c9

Parents:

195d1d8 (diff), b2ea0cd (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

Files:

• AST/BasicKind.hpp (modified) (1 diff)
• AST/Print.cpp (modified) (1 diff)
• AST/Type.cpp (modified) (1 diff)
• AST/TypeEnvironment.cpp (modified) (1 diff)
• BasicTypes-gen.cpp (moved) (moved from src/BasicTypes-gen.cc) (1 diff)
• CodeGen/FixNames.cc (modified) (1 diff)
• CompilationState.cpp (moved) (moved from src/CompilationState.cc)
• CompilationState.hpp (moved) (moved from src/CompilationState.h)
• InitTweak/GenInit.cc (modified) (1 diff)
• MakeLibCfa.cpp (modified) (1 diff)
• MakeLibCfa.hpp (moved) (moved from src/MakeLibCfa.h)
• Makefile.am (modified) (2 diffs)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• ResolvExpr/CommonType.cc (modified) (1 diff)
• ResolvExpr/ConversionCost.cc (modified) (3 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/ManglerCommon.cc (modified) (1 diff)
• Validate/Autogen.cpp (modified) (1 diff)
• main.cpp (moved) (moved from src/main.cc) (2 diffs)

src/AST/BasicKind.hpp

@@ -19 +19 @@
 
 // GENERATED START, DO NOT EDIT
-// GENERATED BY BasicTypes-gen.cc
+// GENERATED BY BasicTypes-gen.cpp
 enum BasicKind {
         Bool,

src/AST/Print.cpp

@@ -23 +23 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "Common/Iterate.hpp"
 

src/AST/Type.cpp

@@ -50 +50 @@
 
 // GENERATED START, DO NOT EDIT
-// GENERATED BY BasicTypes-gen.cc
+// GENERATED BY BasicTypes-gen.cpp
 const char * BasicType::typeNames[] = {
         "_Bool",

src/AST/TypeEnvironment.cpp

@@ -34 +34 @@
 #include "ResolvExpr/Unify.h"      // for unifyInexact
 #include "Tuples/Tuples.h"         // for isTtype
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 
 using ResolvExpr::WidenMode;

src/BasicTypes-gen.cpp

@@ -486 +486 @@
 // tab-width: 4 //
 // mode: c++ //
-// compile-command: "g++-8 -Wall -Wextra BasicTypes-gen.cc" //
+// compile-command: "g++-8 -Wall -Wextra BasicTypes-gen.cpp" //
 // End: //

src/CodeGen/FixNames.cc

@@ -25 +25 @@
 #include "FixMain.h"               // for FixMain
 #include "SymTab/Mangler.h"        // for Mangler
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 
 namespace CodeGen {

src/InitTweak/GenInit.cc

@@ -27 +27 @@
 #include "AST/Node.hpp"
 #include "AST/Stmt.hpp"
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/SemanticError.h"      // for SemanticError

src/MakeLibCfa.cpp

@@ -14 +14 @@
 //
 
-#include "MakeLibCfa.h"
+#include "MakeLibCfa.hpp"
 
 #include "AST/Copy.hpp"

src/Makefile.am

@@ -19 +19 @@
 ACLOCAL_AMFLAGS  = -I automake
 
-SRC = main.cc \
-        CompilationState.cc \
-        CompilationState.h \
+SRC = main.cpp \
+        CompilationState.cpp \
+        CompilationState.hpp \
         MakeLibCfa.cpp \
-        MakeLibCfa.h
+        MakeLibCfa.hpp
 
-SRCDEMANGLE = CompilationState.cc
+SRCDEMANGLE = CompilationState.cpp
 
 MAINTAINERCLEANFILES =
@@ -55 +55 @@
 $(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/AST/BasicKind.hpp
 
-$(srcdir)/AST/BasicKind.hpp : BasicTypes-gen.cc
+$(srcdir)/AST/BasicKind.hpp : BasicTypes-gen.cpp
         ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra -Werror=return-type
         @./BasicTypes-gen

src/ResolvExpr/CandidateFinder.cpp

@@ -26 +26 @@
 #include "Candidate.hpp"
 #include "CastCost.hpp"           // for castCost
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "ConversionCost.h"       // for conversionCast
 #include "Cost.h"

src/ResolvExpr/CommonType.cc

@@ -39 +39 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         #define BT ast::BasicKind::
         static const ast::BasicKind commonTypes[BT NUMBER_OF_BASIC_TYPES][BT NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor

src/ResolvExpr/ConversionCost.cc

@@ -35 +35 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         /* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves)
                                  _Bool
@@ -60 +60 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         static const int costMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
@@ -108 +108 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         static const int signMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */

src/ResolvExpr/Resolver.cc

@@ -28 +28 @@
 #include "typeops.h"                     // for extractResultType
 #include "Unify.h"                       // for unify
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Init.hpp"

src/SymTab/ManglerCommon.cc

@@ -26 +26 @@
 
 // GENERATED START, DO NOT EDIT
-// GENERATED BY BasicTypes-gen.cc
+// GENERATED BY BasicTypes-gen.cpp
 // NOTES ON MANGLING:
 // * Itanium spec says that Float80 encodes to "e" (like LongDouble), but the distinct lengths cause resolution problems.

src/Validate/Autogen.cpp

@@ -42 +42 @@
 #include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
 #include "SymTab/Mangler.h"        // for Mangler
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 
 namespace Validate {

src/main.cpp

@@ -33 +33 @@
 #include "AST/TranslationUnit.hpp"          // for TranslationUnit
 #include "AST/Util.hpp"                     // for checkInvariants
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
@@ -59 +59 @@
 #include "InitTweak/FixInit.h"              // for fix
 #include "InitTweak/GenInit.h"              // for genInit
-#include "MakeLibCfa.h"                     // for makeLibCfa
+#include "MakeLibCfa.hpp"                   // for makeLibCfa
 #include "Parser/RunParser.hpp"             // for buildList, dumpParseTree,...
 #include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates