Changes in src/Parser/parser.yy [ddfd945:861799c7]

File:

• src/Parser/parser.yy (modified) (10 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:36:17 2017
-// Update Count     : 2310
+// Last Modified On : Sun Mar  5 15:48:24 2017
+// Update Count     : 2227
 //
 
@@ -104 +104 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token COROUTINE MONITOR THREAD                                                 // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 %token SIZEOF OFFSETOF
@@ -224 +223 @@
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
 
-%type<decl> identifier_parameter_declarator identifier_parameter_ptr identifier_parameter_array identifier_parameter_function
-%type<decl> identifier_list
+%type<decl> identifier_parameter_array identifier_parameter_declarator identifier_parameter_function
+%type<decl> identifier_parameter_ptr identifier_list
 
 %type<decl> cfa_abstract_array cfa_abstract_declarator_no_tuple cfa_abstract_declarator_tuple
@@ -271 +270 @@
 %type<en> type_name_list
 
-%type<decl> type_qualifier type_qualifier_name type_qualifier_list_opt type_qualifier_list
-%type<decl> type_specifier type_specifier_nobody
+%type<decl> type_qualifier type_qualifier_name type_qualifier_list type_qualifier_list_opt type_specifier type_specifier_nobody
 
 %type<decl> variable_declarator variable_ptr variable_array variable_function
@@ -412 +410 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_REALFRACTIONconstant( *$2 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
+                {
+                        $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
+                }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
                         { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
+        | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
@@ -437 +439 @@
 argument_expression:
         // empty
-                { $$ = nullptr; }
-        // | '@'                                                                                                // use default argument
-        //      { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
+                { $$ = nullptr; }                                                               // use default argument
         | assignment_expression
         ;
@@ -1406 +1406 @@
 type_qualifier_name:
         CONST
-                { $$ = DeclarationNode::newTypeQualifier( Type::Const ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Const ); }
         | RESTRICT
-                { $$ = DeclarationNode::newTypeQualifier( Type::Restrict ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Restrict ); }
         | VOLATILE
-                { $$ = DeclarationNode::newTypeQualifier( Type::Volatile ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Volatile ); }
         | LVALUE                                                                                        // CFA
-                { $$ = DeclarationNode::newTypeQualifier( Type::Lvalue ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Lvalue ); }
         | MUTEX
-                { $$ = DeclarationNode::newTypeQualifier( Type::Mutex ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Mutex ); }
         | ATOMIC
-                { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
+                { $$ = DeclarationNode::newTypeQualifier( DeclarationNode::Atomic ); }
         | FORALL '('
                 {
@@ -1449 +1449 @@
 storage_class:
         EXTERN
-                { $$ = DeclarationNode::newStorageClass( Type::Extern ); }
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
         | STATIC
-                { $$ = DeclarationNode::newStorageClass( Type::Static ); }
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
         | AUTO
-                { $$ = DeclarationNode::newStorageClass( Type::Auto ); }
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
         | REGISTER
-                { $$ = DeclarationNode::newStorageClass( Type::Register ); }
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
         | THREADLOCAL                                                                           // C11
-                { $$ = DeclarationNode::newStorageClass( Type::Threadlocal ); }
+                { $$ = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
                 // Put function specifiers here to simplify parsing rules, but separate them semantically.
         | INLINE                                                                                        // C99
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Inline ); }
+                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Inline ); }
         | FORTRAN                                                                                       // C99
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Fortran ); }
+                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Fortran ); }
         | NORETURN                                                                                      // C11
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Noreturn ); }
+                { $$ = DeclarationNode::newFuncSpecifier( DeclarationNode::Noreturn ); }
         ;
 
@@ -1633 +1633 @@
         | UNION
                 { $$ = DeclarationNode::Union; }
-        | COROUTINE
-                { $$ = DeclarationNode::Struct; }
-        | MONITOR
-                { $$ = DeclarationNode::Struct; }
-        | THREAD
-                { $$ = DeclarationNode::Struct; }
         ;
 
@@ -1684 +1678 @@
         // empty
                 { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
-        // '@' // empty
-        //      { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
         | bit_subrange_size                                                                     // no field name
                 { $$ = DeclarationNode::newBitfield( $1 ); }