Changeset e612146c for src/Parser

Timestamp:

Sep 3, 2017, 11:30:57 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:

3f8dd01

Parents:

f43df73

Message:

third attempt at user-defined literals

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (5 diffs)
• StatementNode.cc (modified) (2 diffs)
• TypeData.cc (modified) (2 diffs)
• TypeData.h (modified) (2 diffs)
• parser.yy (modified) (2 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 : Fri Sep  1 22:57:24 2017
-// Update Count     : 625
+// Last Modified On : Sun Sep  3 22:21:21 2017
+// Update Count     : 639
 //
 
@@ -218 +218 @@
 } // build_constantChar
 
-ConstantExpr * build_constantStr( string & str ) {
+Expression * build_constantStr( string & str ) {
         string units;                                                                           // units
         sepString( str, units, '"' );                                           // separate constant from units
 
-        ArrayType * at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+        BasicType::Kind strtype = BasicType::Char;                      // default string type
+        switch ( str[0] ) {                                                                     // str has >= 2 characters, i.e, null string ""
+          case 'u':
+                if ( str[1] == '8' ) break;                                             // utf-8 characters
+                strtype = BasicType::ShortUnsignedInt;
+                break;
+          case 'U':
+                strtype = BasicType::UnsignedInt;
+                break;
+          case 'L':
+                strtype = BasicType::SignedInt;
+                break;
+        } // switch
+        ArrayType * at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), strtype ),
                                                                         new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
                                                                         false, false );
-        ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
-// ROB: type mismatch
-        // if ( units.length() != 0 ) {
-        //      ret = new UntypedExpr( new NameExpr( units ), { ret } );
-        // } // if
+        Expression * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) ); // constant 0 is ignored for pure string value
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
+        } // if
 
         delete &str;                                                                            // created by lex
@@ -410 +422 @@
 } // build_range
 
-Expression * build_asmexpr( ExpressionNode * inout, ConstantExpr * constraint, ExpressionNode * operand ) {
+Expression * build_asmexpr( ExpressionNode * inout, Expression * constraint, ExpressionNode * operand ) {
         return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) );
 } // build_asmexpr

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 31 17:42:49 2017
-// Update Count     : 797
+// Last Modified On : Sun Sep  3 19:24:34 2017
+// Update Count     : 799
 //
 
@@ -165 +165 @@
 Expression * build_constantFloat( std::string &str );
 Expression * build_constantChar( std::string &str );
-ConstantExpr * build_constantStr( std::string &str );
+Expression * build_constantStr( std::string &str );
 Expression * build_field_name_FLOATINGconstant( const std::string & str );
 Expression * build_field_name_fraction_constants( Expression * fieldName, ExpressionNode * fracts );
@@ -197 +197 @@
 Expression * build_func( ExpressionNode * function, ExpressionNode * expr_node );
 Expression * build_range( ExpressionNode * low, ExpressionNode * high );
-Expression * build_asmexpr( ExpressionNode * inout, ConstantExpr * constraint, ExpressionNode * operand );
+Expression * build_asmexpr( ExpressionNode * inout, Expression * constraint, ExpressionNode * operand );
 Expression * build_valexpr( StatementNode * s );
 Expression * build_compoundLiteral( DeclarationNode * decl_node, InitializerNode * kids );
@@ -330 +330 @@
         bool hasEllipsis;
         LinkageSpec::Spec linkage;
-        ConstantExpr *asmName;
+        Expression *asmName;
         std::list< Attribute * > attributes;
         InitializerNode * initializer;
@@ -413 +413 @@
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
-Statement * build_asmstmt( bool voltile, ConstantExpr * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
+Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when, WaitForStmt * existing );

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 17 16:01:31 2017
-// Update Count     : 345
+// Last Modified On : Fri Sep  1 23:25:23 2017
+// Update Count     : 346
 //
 
@@ -300 +300 @@
 }
 
-Statement *build_asmstmt( bool voltile, ConstantExpr *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
+Statement *build_asmstmt( bool voltile, Expression *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
         std::list< Expression * > out, in;
         std::list< ConstantExpr * > clob;

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:41:00 2017
-// Update Count     : 568
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Sep  1 23:13:38 2017
+// Update Count     : 569
 //
 
@@ -814 +814 @@
 } // buildTypeof
 
-Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init, std::list< Attribute * > attributes ) {
+Declaration * buildDecl( const TypeData * td, const string &name, Type::StorageClasses scs, Expression * bitfieldWidth, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec linkage, Expression *asmName, Initializer * init, std::list< Attribute * > attributes ) {
         if ( td->kind == TypeData::Function ) {
                 if ( td->function.idList ) {                                    // KR function ?

src/Parser/TypeData.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 10:38:00 2017
-// Update Count     : 189
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Sep  1 23:33:45 2017
+// Update Count     : 190
 //
 
@@ -118 +118 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 30 07:04:19 2017
-// Update Count     : 2740
+// Last Modified On : Sun Sep  3 20:43:19 2017
+// Update Count     : 2742
 //
 
@@ -100 +100 @@
         StatementNode * sn;
         WaitForStmt * wfs;
-        ConstantExpr * constant;
+        Expression * constant;
         IfCtl * ifctl;
         ForCtl * fctl;