Changeset 8d182b1 for src/AST

Timestamp:

Nov 14, 2023, 12:19:09 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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/AST

Files:

• Convert.cpp (deleted)
• Convert.hpp (deleted)
• Decl.cpp (modified) (3 diffs)
• SymbolTable.cpp (modified) (1 diff)
• SymbolTable.hpp (modified) (1 diff)
• Type.hpp (modified) (1 diff)
• module.mk (modified) (1 diff)

src/AST/Decl.cpp

@@ -20 +20 @@
 #include <unordered_map>
 
-#include "CodeGen/FixMain.h"   // for FixMain
 #include "Common/Eval.h"       // for eval
 
@@ -76 +75 @@
         }
         this->type = ftype;
-        // Hack forcing the function "main" to have Cforall linkage to replace
-        // main even if it is inside an extern "C", and also makes sure the
-        // replacing function is always a C function.
-        if ( name == "main" ) {
-                this->linkage = CodeGen::FixMain::getMainLinkage();
-        }
 }
 
@@ -108 +101 @@
         }
         this->type = type;
-        // See note above about this hack.
-        if ( name == "main" ) {
-                this->linkage = CodeGen::FixMain::getMainLinkage();
-        }
 }
 

src/AST/SymbolTable.cpp

@@ -39 +39 @@
         static inline auto stats() {
                 using namespace Stats::Counters;
-                static auto group   = build<CounterGroup>("Indexers");
+                static auto group   = build<CounterGroup>("Symbol Tables");
                 static struct {
                         SimpleCounter * count;

src/AST/SymbolTable.hpp

@@ -88 +88 @@
         using Ptr = std::shared_ptr<const SymbolTable>;
 
-        Ptr prevScope;                 ///< Indexer for parent scope
+        Ptr prevScope;                 ///< Symbol Table for parent scope
         unsigned long scope;           ///< Scope index of this indexer
         unsigned long repScope;        ///< Scope index of currently represented scope

src/AST/Type.hpp

@@ -34 +34 @@
 
 namespace ast {
-
-template< typename T > class Pass;
 
 class Type : public Node {

src/AST/module.mk

@@ -20 +20 @@
         AST/Bitfield.hpp \
         AST/Chain.hpp \
-        AST/Convert.cpp \
-        AST/Convert.hpp \
         AST/Copy.cpp \
         AST/Copy.hpp \