Changeset cd7ef0b for src/Parser/ExpressionNode.cc

Timestamp:

Aug 10, 2017, 3:39:11 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

38d70ab

Parents:

275f4b4 (diff), e1780a2 (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

File:

• src/Parser/ExpressionNode.cc (modified) (13 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 10:11:00 2017
-// Update Count     : 551
-//
-
-#include <cassert>
-#include <cctype>
-#include <climits>
-#include <cstdio>
-#include <algorithm>
+// Last Modified On : Wed Aug  2 11:12:00 2017
+// Update Count     : 568
+//
+
+#include <climits>                                                                              // access INT_MAX, UINT_MAX, LONG_MAX, ULONG_MAX, LLONG_MAX
 #include <sstream>
 
@@ -26 +22 @@
 #include "SynTree/Expression.h"
 #include "SynTree/Declaration.h"
-#include "Common/UnimplementedError.h"
 #include "parserutility.h"
-#include "Common/utility.h"
 
 using namespace std;
@@ -46 +40 @@
 // type.
 
-Type::Qualifiers noQualifiers;                          // no qualifiers on constants
+extern const Type::Qualifiers noQualifiers;             // no qualifiers on constants
 
 static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
@@ -55 +49 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-Expression *build_constantInteger( const std::string & str ) {
+Expression * build_constantInteger( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -62 +56 @@
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
-        unsigned long long int v;                                                               // converted integral value
+        unsigned long long int v;                                                       // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
-
+        Expression * ret;
+
+        // special constants
+        if ( str == "0" ) {
+                ret = new ConstantExpr( Constant( (Type *)new ZeroType( noQualifiers ), str, (unsigned long long int)0 ) );
+                goto CLEANUP;
+        } // if
+        if ( str == "1" ) {
+                ret = new ConstantExpr( Constant( (Type *)new OneType( noQualifiers ), str, (unsigned long long int)1 ) );
+                goto CLEANUP;
+        } // if
+        
         if ( str[0] == '0' ) {                                                          // octal/hex constant ?
                 dec = false;
@@ -118 +123 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+  CLEANUP:
         delete &str;                                                                            // created by lex
         return ret;
 } // build_constantInteger
 
-Expression *build_constantFloat( const std::string & str ) {
+Expression * build_constantFloat( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -158 +164 @@
 } // build_constantFloat
 
-Expression *build_constantChar( const std::string & str ) {
+Expression * build_constantChar( const std::string & str ) {
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
         delete &str;                                                                            // created by lex
@@ -164 +170 @@
 } // build_constantChar
 
-ConstantExpr *build_constantStr( const std::string & str ) {
+ConstantExpr * build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
-        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 '"'
+        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 );
-        // constant 0 is ignored for pure string value
-        ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) );
+        ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
         delete &str;                                                                            // created by lex
         return ret;
 } // build_constantStr
-
-Expression *build_constantZeroOne( const std::string & 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
-        return ret;
-} // build_constantChar
 
 Expression * build_field_name_FLOATINGconstant( const std::string & str ) {
@@ -209 +207 @@
 } // build_field_name_fraction_constants
 
-
-
 Expression * build_field_name_REALFRACTIONconstant( const std::string & str ) {
         if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str );
@@ -225 +221 @@
 } // build_field_name_REALDECIMALconstant
 
-NameExpr * build_varref( const string *name ) {
-        NameExpr *expr = new NameExpr( *name, nullptr );
+NameExpr * build_varref( const string * name ) {
+        NameExpr * expr = new NameExpr( *name, nullptr );
         delete name;
         return expr;
-}
-
-// Must harmonize with OperKinds.
-static const char *OperName[] = {
+} // build_varref
+
+
+static const char * OperName[] = {                                              // must harmonize with OperKinds
         // diadic
         "SizeOf", "AlignOf", "OffsetOf", "?+?", "?-?", "?\\?", "?*?", "?/?", "?%?", "||", "&&",
@@ -240 +236 @@
         // monadic
         "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--", "&&"
-};
-
-Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = maybeMoveBuildType( decl_node );
+}; // OperName
+
+Expression * build_cast( DeclarationNode * decl_node, ExpressionNode * expr_node ) {
+        Type * targetType = maybeMoveBuildType( decl_node );
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
@@ -250 +246 @@
                 return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
         } // if
-}
-
-
-Expression *build_virtual_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = maybeMoveBuildType( decl_node );
-        Expression *castArg = maybeMoveBuild< Expression >( expr_node );
+} // build_cast
+
+Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node ) {
+        Type * targetType = maybeMoveBuildType( decl_node );
+        Expression * castArg = maybeMoveBuild< Expression >( expr_node );
         return new VirtualCastExpr( castArg, targetType );
-}
-
-Expression *build_fieldSel( ExpressionNode *expr_node, Expression *member ) {
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
-        return ret;
-}
-
-Expression *build_pfieldSel( ExpressionNode *expr_node, Expression *member ) {
-        UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
+} // build_virtual_cast
+
+Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member ) {
+        UntypedMemberExpr * ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
+        return ret;
+} // build_fieldSel
+
+Expression * build_pfieldSel( ExpressionNode * expr_node, Expression * member ) {
+        UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
         deref->location = expr_node->location;
         deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, deref );
-        return ret;
-}
-
-Expression *build_addressOf( ExpressionNode *expr_node ) {
+        UntypedMemberExpr * ret = new UntypedMemberExpr( member, deref );
+        return ret;
+} // build_pfieldSel
+
+Expression * build_addressOf( ExpressionNode * expr_node ) {
                 return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
-}
-Expression *build_sizeOfexpr( ExpressionNode *expr_node ) {
+} // build_addressOf
+
+Expression * build_sizeOfexpr( ExpressionNode * expr_node ) {
         return new SizeofExpr( maybeMoveBuild< Expression >(expr_node) );
-}
-Expression *build_sizeOftype( DeclarationNode *decl_node ) {
+} // build_sizeOfexpr
+
+Expression * build_sizeOftype( DeclarationNode * decl_node ) {
         return new SizeofExpr( maybeMoveBuildType( decl_node ) );
-}
-Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
+} // build_sizeOftype
+
+Expression * build_alignOfexpr( ExpressionNode * expr_node ) {
         return new AlignofExpr( maybeMoveBuild< Expression >(expr_node) );
-}
-Expression *build_alignOftype( DeclarationNode *decl_node ) {
+} // build_alignOfexpr
+
+Expression * build_alignOftype( DeclarationNode * decl_node ) {
         return new AlignofExpr( maybeMoveBuildType( decl_node) );
-}
-Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
+} // build_alignOftype
+
+Expression * build_offsetOf( DeclarationNode * decl_node, NameExpr * member ) {
         Expression * ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
         delete member;
         return ret;
-}
-
-Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind ) {
+} // build_offsetOf
+
+Expression * build_and_or( ExpressionNode * expr_node1, ExpressionNode * expr_node2, bool kind ) {
         return new LogicalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), notZeroExpr( maybeMoveBuild< Expression >(expr_node2) ), kind );
-}
-
-Expression *build_unary_val( OperKinds op, ExpressionNode *expr_node ) {
+} // build_and_or
+
+Expression * build_unary_val( OperKinds op, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
         args.push_back( maybeMoveBuild< Expression >(expr_node) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
-}
-Expression *build_unary_ptr( OperKinds op, ExpressionNode *expr_node ) {
+} // build_unary_val
+
+Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
         args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node) ) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
-}
-Expression *build_binary_val( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
+} // build_unary_ptr
+
+Expression * build_binary_val( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
         std::list< Expression * > args;
         args.push_back( maybeMoveBuild< Expression >(expr_node1) );
         args.push_back( maybeMoveBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
-}
-Expression *build_binary_ptr( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
+} // build_binary_val
+
+Expression * build_binary_ptr( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
         std::list< Expression * > args;
         args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node1) ) );
         args.push_back( maybeMoveBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
-}
-
-Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 ) {
+} // build_binary_ptr
+
+Expression * build_cond( ExpressionNode * expr_node1, ExpressionNode * expr_node2, ExpressionNode * expr_node3 ) {
         return new ConditionalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), maybeMoveBuild< Expression >(expr_node2), maybeMoveBuild< Expression >(expr_node3) );
-}
-
-Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
+} // build_cond
+
+Expression * build_comma( ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
         return new CommaExpr( maybeMoveBuild< Expression >(expr_node1), maybeMoveBuild< Expression >(expr_node2) );
-}
-
-Expression *build_attrexpr( NameExpr *var, ExpressionNode * expr_node ) {
+} // build_comma
+
+Expression * build_attrexpr( NameExpr * var, ExpressionNode * expr_node ) {
         return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) );
-}
-Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
+} // build_attrexpr
+
+Expression * build_attrtype( NameExpr * var, DeclarationNode * decl_node ) {
         return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
-}
-
-Expression *build_tuple( ExpressionNode * expr_node ) {
+} // build_attrtype
+
+Expression * build_tuple( ExpressionNode * expr_node ) {
         std::list< Expression * > exprs;
         buildMoveList( expr_node, exprs );
         return new UntypedTupleExpr( exprs );;
-}
-
-Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node ) {
+} // build_tuple
+
+Expression * build_func( ExpressionNode * function, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
         buildMoveList( expr_node, args );
         return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr );
-}
-
-Expression *build_range( ExpressionNode * low, ExpressionNode *high ) {
+} // build_func
+
+Expression * build_range( ExpressionNode * low, ExpressionNode * high ) {
         return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) );
-}
-
-Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ) {
+} // build_range
+
+Expression * build_asmexpr( ExpressionNode * inout, ConstantExpr * constraint, ExpressionNode * operand ) {
         return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) );
-}
-
-Expression *build_valexpr( StatementNode *s ) {
+} // build_asmexpr
+
+Expression * build_valexpr( StatementNode * s ) {
         return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
-}
-Expression *build_typevalue( DeclarationNode *decl ) {
+} // build_valexpr
+
+Expression * build_typevalue( DeclarationNode * decl ) {
         return new TypeExpr( maybeMoveBuildType( decl ) );
-}
-
-Expression *build_compoundLiteral( DeclarationNode *decl_node, InitializerNode *kids ) {
+} // build_typevalue
+
+Expression * build_compoundLiteral( DeclarationNode * decl_node, InitializerNode * kids ) {
         Declaration * newDecl = maybeBuild< Declaration >(decl_node); // compound literal type
         if ( DeclarationWithType * newDeclWithType = dynamic_cast< DeclarationWithType * >( newDecl ) ) { // non-sue compound-literal type
@@ -388 +393 @@
                 assert( false );
         } // if
-}
+} // build_compoundLiteral
 
 // Local Variables: //