Changeset 66f8528 for src/SynTree

Timestamp:

Dec 15, 2016, 5:16:42 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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

Location:

src/SynTree

Files:

• Declaration.h (modified) (4 diffs)
• DeclarationWithType.cc (modified) (3 diffs)
• Expression.cc (modified) (1 diff)
• Type.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:50:24 2016
-// Update Count     : 40
+// Last Modified On : Tue Dec 13 13:37:33 2016
+// Update Count     : 49
 //
 
@@ -69 +69 @@
 
         std::string get_mangleName() const { return mangleName; }
-        void set_mangleName( std::string newValue ) { mangleName = newValue; }
+        DeclarationWithType * set_mangleName( std::string newValue ) { mangleName = newValue; return this; }
 
         std::string get_scopedMangleName() const { return mangleName + "_" + std::to_string(scopeLevel); }
 
         int get_scopeLevel() const { return scopeLevel; }
-        void set_scopeLevel( int newValue ) { scopeLevel = newValue; }
+        DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
+
+        ConstantExpr *get_asmName() const { return asmName; }
+        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
 
         std::list< Attribute * >& get_attributes() { return attributes; }
@@ -87 +90 @@
         // this represents the type with all types and typedefs expanded it is generated by SymTab::Validate::Pass2
         std::string mangleName;
-        // need to remember the scope level at which the variable was declared, so that
-        // shadowed identifiers can be accessed
+        // need to remember the scope level at which the variable was declared, so that shadowed identifiers can be accessed
         int scopeLevel = 0;
 
+        ConstantExpr *asmName;
         std::list< Attribute * > attributes;
 };
@@ -106 +109 @@
         Initializer *get_init() const { return init; }
         void set_init( Initializer *newValue ) { init = newValue; }
+
         Expression *get_bitfieldWidth() const { return bitfieldWidth; }
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }

src/SynTree/DeclarationWithType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:50:41 2016
-// Update Count     : 4
+// Last Modified On : Tue Dec 13 14:49:43 2016
+// Update Count     : 7
 //
 
@@ -20 +20 @@
 
 DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes )
-                : Declaration( name, sc, linkage ), attributes( attributes ) {
+        : Declaration( name, sc, linkage ), asmName( nullptr ), attributes( attributes ) {
 }
 
@@ -26 +26 @@
                 : Declaration( other ), mangleName( other.mangleName ), scopeLevel( other.scopeLevel ) {
         cloneAll( other.attributes, attributes );
+        asmName = maybeClone( other.asmName );
 }
 
 DeclarationWithType::~DeclarationWithType() {
         deleteAll( attributes );
+        delete asmName;
 }
 

src/SynTree/Expression.cc

@@ -438 +438 @@
 }
 
-NameExpr::NameExpr( std::string _name, Expression *_aname ) : Expression( _aname ), name(_name) {}
+NameExpr::NameExpr( std::string _name, Expression *_aname ) : Expression( _aname ), name(_name) {
+        assertf(_name != "0", "Zero is not a valid name\n");
+        assertf(_name != "1", "One is not a valid name\n");
+}
 
 NameExpr::NameExpr( const NameExpr &other ) : Expression( other ), name( other.name ) {

src/SynTree/Type.h

@@ -82 +82 @@
         ForallList forall;
 };
+
+extern Type::Qualifiers emptyQualifiers;                                // no qualifiers on constants
 
 class VoidType : public Type {