Changeset 9236060 for src/CodeGen

Timestamp:

Aug 14, 2017, 2:03:39 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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

Children:

74b007ba

Parents:

fd344aa (diff), 54cd58b0 (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' into references

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (2 diffs)
• CodeGenerator.h (modified) (4 diffs)
• FixMain.h (modified) (2 diffs)
• FixNames.h (modified) (2 diffs)
• GenType.cc (modified) (2 diffs)
• GenType.h (modified) (2 diffs)
• Generate.cc (modified) (2 diffs)
• Generate.h (modified) (2 diffs)
• OperatorTable.cc (modified) (3 diffs)
• OperatorTable.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 16:00:00 2017
-// Update Count     : 485
+// Last Modified On : Tus Jul 25 15:29:00 2017
+// Update Count     : 486
 //
+#include "CodeGenerator.h"
 
 #include <cassert>                   // for assert, assertf
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "CodeGenerator.h"
 #include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
@@ -556 +556 @@
                         // never an lvalue in C
                 } // if
+                castExpr->get_arg()->accept( *this );
+                output << ")";
+        }
+
+        void CodeGenerator::visit( VirtualCastExpr * castExpr ) {
+                assertf( ! genC, "VirtualCastExpr should not reach code generation." );
+                extension( castExpr );
+                output << "(virtual ";
                 castExpr->get_arg()->accept( *this );
                 output << ")";

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 15:48:00 2017
-// Update Count     : 52
+// Last Modified On : Tus Jul 25 25:30:00 2017
+// Update Count     : 54
 //
 
-#ifndef CODEGENV_H
-#define CODEGENV_H
+#pragma once
 
 #include <list>                   // for list
@@ -26 +25 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+#include "Common/Indenter.h"      // for Indenter
 
 namespace CodeGen {
@@ -62 +63 @@
                 virtual void visit( AddressExpr *addressExpr );
                 virtual void visit( CastExpr *castExpr );
+                virtual void visit( VirtualCastExpr *castExpr );
                 virtual void visit( UntypedMemberExpr *memberExpr );
                 virtual void visit( MemberExpr *memberExpr );
@@ -161 +163 @@
 } // namespace CodeGen
 
-#endif // CODEGENV_H
-
 // Local Variables: //
 // tab-width: 4 //

src/CodeGen/FixMain.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thr Jan 12 14:11:09 2017
-// Last Modified By : 
-// Last Modified On : 
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:16:59 2017
+// Update Count     : 1
 //
 
-#ifndef FIXMAIN_H
-#define FIXMAIN_H
+#pragma once
 
 #include <iosfwd>
@@ -44 +43 @@
         };
 };
-
-#endif //FIXMAIN_H

src/CodeGen/FixNames.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:37:32 2015
-// Update Count     : 2
+// Last Modified On : Fri Jul 21 22:17:33 2017
+// Update Count     : 3
 //
 
-#ifndef FIXNAMES_H
-#define FIXNAMES_H
+#pragma once
 
 #include <list>  // for list
@@ -26 +25 @@
 } // namespace CodeGen
 
-#endif // FIXNAMES_H
-
 // Local Variables: //
 // tab-width: 4 //

src/CodeGen/GenType.cc

@@ -13 +13 @@
 // Update Count     : 22
 //
+#include "GenType.h"
 
 #include <cassert>                // for assert, assertf
@@ -19 +20 @@
 
 #include "CodeGenerator.h"        // for CodeGenerator
-#include "GenType.h"
 #include "SynTree/Declaration.h"  // for DeclarationWithType
 #include "SynTree/Expression.h"   // for Expression

src/CodeGen/GenType.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:38:53 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:17:23 2017
+// Update Count     : 2
 //
 
-#ifndef _GENTYPE_H
-#define _GENTYPE_H
+#pragma once
 
 #include <string>  // for string
@@ -26 +25 @@
 } // namespace CodeGen
 
-#endif // _GENTYPE_H
-
 // Local Variables: //
 // tab-width: 4 //

src/CodeGen/Generate.cc

@@ -13 +13 @@
 // Update Count     : 6
 //
+#include "Generate.h"
 
 #include <iostream>                  // for ostream, endl, operator<<
@@ -20 +21 @@
 #include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
 #include "GenType.h"                 // for genPrettyType
-#include "Generate.h"
 #include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode

src/CodeGen/Generate.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:39:51 2015
-// Update Count     : 1
+// Last Modified On : Fri Jul 21 22:16:35 2017
+// Update Count     : 2
 //
 
-#ifndef GENERATE_H
-#define GENERATE_H
+#pragma once
 
 #include <iostream>  // for ostream
@@ -31 +30 @@
 } // namespace CodeGen
 
-#endif // GENERATE_H
-
 // Local Variables: //
 // tab-width: 4 //

src/CodeGen/OperatorTable.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 13 14:33:05 2016
-// Update Count     : 10
+// Last Modified On : Sat Jul 15 17:12:22 2017
+// Update Count     : 15
 //
 
@@ -36 +36 @@
                         {       "++?",          "++",   "_operator_preincr",                    OT_PREFIXASSIGN         },
                         {       "--?",          "--",   "_operator_predecr",                    OT_PREFIXASSIGN         },
+                        {       "?\\?",         "\\",   "_operator_exponential",                OT_INFIX                        },
                         {       "?*?",          "*",    "_operator_multiply",                   OT_INFIX                        },
                         {       "?/?",          "/",    "_operator_divide",                             OT_INFIX                        },
@@ -53 +54 @@
                         {       "?|?",          "|",    "_operator_bitor",                              OT_INFIX                        },
                         {       "?=?",          "=",    "_operator_assign",                             OT_INFIXASSIGN          },
+                        {       "?\\=?",        "\\=",  "_operator_expassign",                  OT_INFIXASSIGN          },
                         {       "?*=?",         "*=",   "_operator_multassign",                 OT_INFIXASSIGN          },
                         {       "?/=?",         "/=",   "_operator_divassign",                  OT_INFIXASSIGN          },

src/CodeGen/OperatorTable.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:17:57 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 21 22:17:11 2017
+// Update Count     : 6
 //
 
-#ifndef _OPERATORTABLE_H
-#define _OPERATORTABLE_H
+#pragma once
 
 #include <string>
@@ -51 +50 @@
 } // namespace CodeGen
 
-#endif // _OPERATORTABLE_H
-
 // Local Variables: //
 // tab-width: 4 //