Changeset 513e165 for src/Parser/ExpressionNode.cc

Timestamp:

Sep 13, 2017, 3:09:12 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

121c3c0

Parents:

7aa257ae

Message:

generalize types for encoded strings, and fold simple ExpressionNode? build routines into parser

File:

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

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Sep 12 10:00:29 2017
-// Update Count     : 672
+// Last Modified On : Wed Sep 13 14:54:19 2017
+// Update Count     : 683
 //
 
@@ -250 +250 @@
         sepString( str, units, '"' );                                           // separate constant from units
 
-        BasicType::Kind strtype = BasicType::Char;                      // default string type
-        switch ( str[0] ) {                                                                     // str has >= 2 characters, i.e, null string ""
+        Type * strtype;
+        switch ( str[0] ) {                                                                     // str has >= 2 characters, i.e, null string "" => safe to look at subscripts 0/1
           case 'u':
-                if ( str[1] == '8' ) break;                                             // utf-8 characters
-                strtype = BasicType::ShortUnsignedInt;
+                if ( str[1] == '8' ) goto Default;                              // utf-8 characters => array of char
+                // lookup type of associated typedef
+                strtype = new TypeInstType( Type::Qualifiers( Type::Const ), "char16_t", false );
                 break;
           case 'U':
-                strtype = BasicType::UnsignedInt;
+                strtype = new TypeInstType( Type::Qualifiers( Type::Const ), "char32_t", false );
                 break;
           case 'L':
-                strtype = BasicType::SignedInt;
+                strtype = new TypeInstType( Type::Qualifiers( Type::Const ), "wchar_t", false );
                 break;
+          Default:                                                                                      // char default string type
+          default:
+                strtype = new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char );
         } // switch
-        ArrayType * at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), strtype ),
+        ArrayType * at = new ArrayType( noQualifiers, strtype,
                                                                         new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
                                                                         false, false );
@@ -344 +348 @@
 
 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 );
+        return new VirtualCastExpr( maybeMoveBuild< Expression >( expr_node ), maybeMoveBuildType( decl_node ) );
 } // build_virtual_cast
 
 Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member ) {
-        UntypedMemberExpr * ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
-        return ret;
+        return new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
 } // build_fieldSel
 
@@ -363 +364 @@
 
 Expression * build_addressOf( ExpressionNode * expr_node ) {
-                return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
+        return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
 } // build_addressOf
 
@@ -422 +423 @@
 } // build_cond
 
-Expression * build_comma( ExpressionNode * expr_node1, ExpressionNode * expr_node2 ) {
-        return new CommaExpr( maybeMoveBuild< Expression >(expr_node1), maybeMoveBuild< Expression >(expr_node2) );
-} // build_comma
-
 Expression * build_attrexpr( NameExpr * var, ExpressionNode * expr_node ) {
         return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) );
@@ -449 +446 @@
         return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) );
 } // build_range
-
-Expression * build_asmexpr( ExpressionNode * inout, Expression * constraint, ExpressionNode * operand ) {
-        return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) );
-} // build_asmexpr
-
-Expression * build_valexpr( StatementNode * s ) {
-        return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
-} // build_valexpr
-
-Expression * build_typevalue( DeclarationNode * decl ) {
-        return new TypeExpr( maybeMoveBuildType( decl ) );
-} // build_typevalue
 
 Expression * build_compoundLiteral( DeclarationNode * decl_node, InitializerNode * kids ) {