Changes in src/Parser/parser.yy [24711a3:9380add]

File:

• src/Parser/parser.yy (modified) (11 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 : Mon Apr 26 18:41:54 2021
-// Update Count     : 4990
+// Last Modified On : Tue Jun 29 09:12:47 2021
+// Update Count     : 5027
 //
 
@@ -26 +26 @@
 // The root language for this grammar is ANSI99/11 C. All of ANSI99/11 is parsed, except for:
 //
-// 1. designation with '=' (use ':' instead)
-//
-// Most of the syntactic extensions from ANSI90 to ANSI11 C are marked with the comment "C99/C11". This grammar also has
-// two levels of extensions. The first extensions cover most of the GCC C extensions, except for:
-//
-// 1. designation with and without '=' (use ':' instead)
-
-//
-// All of the syntactic extensions for GCC C are marked with the comment "GCC". The second extensions are for Cforall
-// (CFA), which fixes several of C's outstanding problems and extends C with many modern language concepts. All of the
-// syntactic extensions for CFA C are marked with the comment "CFA". As noted above, there is one unreconcileable
-// parsing problem between C99 and CFA with respect to designators; this is discussed in detail before the "designation"
-// grammar rule.
+//   designation with '=' (use ':' instead)
+//
+// This incompatibility is discussed in detail before the "designation" grammar rule.  Most of the syntactic extensions
+// from ANSI90 to ANSI11 C are marked with the comment "C99/C11".
+
+// This grammar also has two levels of extensions. The first extensions cover most of the GCC C extensions All of the
+// syntactic extensions for GCC C are marked with the comment "GCC". The second extensions are for Cforall (CFA), which
+// fixes several of C's outstanding problems and extends C with many modern language concepts. All of the syntactic
+// extensions for CFA C are marked with the comment "CFA".
 
 %{
@@ -269 +265 @@
 %token INT128 UINT128 uuFLOAT80 uuFLOAT128                              // GCC
 %token uFLOAT16 uFLOAT32 uFLOAT32X uFLOAT64 uFLOAT64X uFLOAT128 // GCC
+%token DECIMAL32 DECIMAL64 DECIMAL128                                   // GCC
 %token ZERO_T ONE_T                                                                             // CFA
 %token SIZEOF TYPEOF VALIST AUTO_TYPE                                   // GCC
@@ -287 +284 @@
 
 // names and constants: lexer differentiates between identifier and typedef names
-%token<tok> IDENTIFIER          QUOTED_IDENTIFIER       TYPEDEFname             TYPEGENname
+%token<tok> IDENTIFIER          QUOTED_IDENTIFIER       TYPEDIMname             TYPEDEFname             TYPEGENname
 %token<tok> TIMEOUT                     WOR                                     CATCH                   RECOVER                 CATCHRESUME             FIXUP           FINALLY         // CFA
 %token<tok> INTEGERconstant     CHARACTERconstant       STRINGliteral
@@ -586 +583 @@
         | quasi_keyword
                 { $$ = new ExpressionNode( build_varref( $1 ) ); }
+        | TYPEDIMname                                                                           // CFA, generic length argument
+                // { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( DeclarationNode::newFromTypedef( $1 ) ) ) ); }
+                // { $$ = new ExpressionNode( build_varref( $1 ) ); }
+                { $$ = new ExpressionNode( build_dimensionref( $1 ) ); }
         | tuple
         | '(' comma_expression ')'
@@ -630 +631 @@
 postfix_expression:
         primary_expression
-        | postfix_expression '[' assignment_expression ',' comma_expression ']'
-                // { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, new ExpressionNode( build_binary_val( OperKinds::Index, $3, $5 ) ) ) ); }
-                { SemanticError( yylloc, "New array subscript is currently unimplemented." ); $$ = nullptr; }
+        | postfix_expression '[' assignment_expression ',' tuple_expression_list ']'
+                        // Historic, transitional: Disallow commas in subscripts.
+                        // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
+                // { SemanticError( yylloc, "New array subscript is currently unimplemented." ); $$ = nullptr; }
+                        // Current: Commas in subscripts make tuples.
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, new ExpressionNode( build_tuple( (ExpressionNode *)($3->set_last( $5 ) ) )) ) ); }
         | postfix_expression '[' assignment_expression ']'
                 // CFA, comma_expression disallowed in this context because it results in a common user error: subscripting a
@@ -1887 +1891 @@
         | uFLOAT128
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::uFloat128 ); }
+        | DECIMAL32
+                { SemanticError( yylloc, "_Decimal32 is currently unimplemented." ); $$ = nullptr; }
+        | DECIMAL64
+                { SemanticError( yylloc, "_Decimal64 is currently unimplemented." ); $$ = nullptr; }
+        | DECIMAL128
+                { SemanticError( yylloc, "_Decimal128 is currently unimplemented." ); $$ = nullptr; }
         | COMPLEX                                                                                       // C99
                 { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
@@ -1909 +1919 @@
         // empty
                 { $$ = nullptr; }
-        | vtable;
+        | vtable
         ;
 
@@ -2535 +2545 @@
         | '[' identifier_or_type_name ']'
                 {
-                        typedefTable.addToScope( *$2, TYPEDEFname, "9" );
-                        $$ = DeclarationNode::newTypeParam( TypeDecl::ALtype, $2 );
+                        typedefTable.addToScope( *$2, TYPEDIMname, "9" );
+                        $$ = DeclarationNode::newTypeParam( TypeDecl::Dimension, $2 );
                 }
         // | type_specifier identifier_parameter_declarator
@@ -2550 +2560 @@
         | '*'
                 { $$ = TypeDecl::DStype; }                                              // dtype + sized
+        // | '(' '*' ')'
+        //      { $$ = TypeDecl::Ftype; }
         | ELLIPSIS
                 { $$ = TypeDecl::Ttype; }
@@ -2590 +2602 @@
                 { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
                 { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) )); }
         | type_list ',' assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }
-                // { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;