Changeset 4e2b9710 for src/Parser

Timestamp:

Aug 25, 2016, 9:14:18 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

a839867

Parents:

c1c1112 (diff), 486341f (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 plg2:software/cfa/cfa-cc

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• LinkageSpec.cc (modified) (7 diffs)
• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)
• TypeData.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -50 +50 @@
         newnode->isInline = isInline;
         newnode->isNoreturn = isNoreturn;
-        newnode->bitfieldWidth = bitfieldWidth;
+        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->hasEllipsis = hasEllipsis;
-        newnode->initializer = initializer;
+        newnode->initializer = maybeClone( initializer );
         newnode->set_next( maybeClone( get_next() ) );
         newnode->linkage = linkage;
@@ -823 +823 @@
                                         *out++ = decl;
                                 } // if
+                                delete extr;
                         } // if
                         Declaration *decl = cur->build();

src/Parser/LinkageSpec.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LinkageSpec.cc -- 
-// 
+// LinkageSpec.cc --
+//
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
@@ -12 +12 @@
 // Last Modified On : Sun Aug 21 12:32:53 2016
 // Update Count     : 17
-// 
+//
 
 #include <string>
@@ -32 +32 @@
 
 std::string LinkageSpec::toString( LinkageSpec::Spec linkage ) {
+        assert( linkage >= 0 && linkage < LinkageSpec::NoOfSpecs );
         static const char *linkageKinds[LinkageSpec::NoOfSpecs] = {
                 "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
@@ -39 +40 @@
 
 bool LinkageSpec::isDecoratable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool decoratable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           true,           false,  true,           false, 
+                        true,           true,           false,  true,           false,
         };
         return decoratable[spec];
@@ -47 +49 @@
 
 bool LinkageSpec::isGeneratable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool generatable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           true,           true,   true,           false, 
+                        true,           true,           true,   true,           false,
         };
         return generatable[spec];
@@ -55 +58 @@
 
 bool LinkageSpec::isOverridable( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool overridable[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           false,          false,  true,           false, 
+                        true,           false,          false,  true,           false,
         };
         return overridable[spec];
@@ -63 +67 @@
 
 bool LinkageSpec::isBuiltin( Spec spec ) {
+        assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs );
         static bool builtin[LinkageSpec::NoOfSpecs] = {
                 //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
-                        true,           false,          false,  false,          true, 
+                        true,           false,          false,  false,          true,
         };
         return builtin[spec];

src/Parser/ParseNode.h

@@ -109 +109 @@
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {}
-        virtual ExpressionNode *clone() const { assert( false ); return nullptr; }
+        virtual ExpressionNode *clone() const { return expr ? new ExpressionNode( expr->clone() ) : nullptr; }
 
         bool get_extension() const { return extension; }

src/Parser/StatementNode.cc

@@ -44 +44 @@
                         agg = decl;
                 } // if
-                stmt.reset( new DeclStmt( noLabels, maybeBuild< Declaration >(agg) ) );
+                stmt.reset( new DeclStmt( noLabels, maybeMoveBuild< Declaration >(agg) ) );
         } else {
                 assert( false );

src/Parser/TypeData.cc

@@ -182 +182 @@
                 break;
           case Array:
-                newtype->array->dimension = array->dimension;
+                newtype->array->dimension = maybeClone( array->dimension );
                 newtype->array->isVarLen = array->isVarLen;
                 newtype->array->isStatic = array->isStatic;