Changeset ac10576 for src/Parser

Timestamp:

Jul 18, 2017, 10:22:23 AM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

a57cb58, d49bfa8

Parents:

b15f6cf

Message:

Replaced emptyQualifiers with noQualifiers for consistancy with noLabels and noAttributes.

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (7 diffs)
• TypeData.cc (modified) (2 diffs)
• parserutility.cc (modified) (2 diffs)

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 16:09:04 2017
-// Update Count     : 549
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:08:00 2017
+// Update Count     : 550
 //
 
@@ -46 +46 @@
 // type.
 
-Type::Qualifiers emptyQualifiers;                               // no qualifiers on constants
+Type::Qualifiers noQualifiers;                          // no qualifiers on constants
 
 static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
@@ -118 +118 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str, v ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -153 +153 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str, v ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -159 +159 @@
 
 Expression *build_constantChar( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -166 +166 @@
 ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
-        ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+        ArrayType *at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
                                                                    new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
@@ -176 +176 @@
 
 Expression *build_constantZeroOne( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str,
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( noQualifiers ) : (Type*)new OneType( noQualifiers ), str,
                                                                                                    str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
         delete &str;                                                                            // created by lex

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:58:00 2017
-// Update Count     : 565
+// Last Modified On : Tus Jul 18 10:10:00 2017
+// Update Count     : 566
 //
 
@@ -454 +454 @@
           case TypeData::Builtin:
                 if(td->builtintype == DeclarationNode::Zero) {
-                        return new ZeroType( emptyQualifiers );
+                        return new ZeroType( noQualifiers );
                 }
                 else if(td->builtintype == DeclarationNode::One) {
-                        return new OneType( emptyQualifiers );
+                        return new OneType( noQualifiers );
                 }
                 else {

src/Parser/parserutility.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:30:39 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 22:11:32 2017
-// Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:12:00 2017
+// Update Count     : 8
 //
 
@@ -26 +26 @@
         UntypedExpr *comparison = new UntypedExpr( new NameExpr( "?!=?" ) );
         comparison->get_args().push_back( orig );
-        comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0", (unsigned long long int)0 ) ) );
+        comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( noQualifiers ), "0", (unsigned long long int)0 ) ) );
         return new CastExpr( comparison, new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
 }