Changes in src/Parser/parser.yy [c27fb59:24c3b67]

File:

• src/Parser/parser.yy (modified) (13 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 Feb 22 17:48:54 2018
-// Update Count     : 3028
+// Last Modified On : Thu Feb 15 17:12:31 2018
+// Update Count     : 3006
 //
 
@@ -187 +187 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token EXCEPTION                                                                                // CFA
 %token COROUTINE MONITOR THREAD                                                 // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
@@ -315 +314 @@
 %type<decl> cfa_identifier_parameter_declarator_tuple cfa_identifier_parameter_ptr
 
-%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list_opt
+%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list cfa_parameter_type_list_opt
 
 %type<decl> cfa_typedef_declaration cfa_variable_declaration cfa_variable_specifier
@@ -323 +322 @@
 %type<decl> KR_declaration_list KR_declaration_list_opt
 
-%type<decl> parameter_declaration parameter_list parameter_type_list_opt
+%type<decl> parameter_declaration parameter_list parameter_type_list
+%type<decl> parameter_type_list_opt
 
 %type<decl> paren_identifier paren_type
@@ -779 +779 @@
         | unary_expression assignment_operator assignment_expression
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
-        | unary_expression '=' '{' initializer_list comma_opt '}'
-                { throw SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; } // FIX ME
+        | unary_expression '=' '{' initializer_list comma_opt '}' // FIX ME
+                { $$ = nullptr; }
         ;
 
@@ -849 +849 @@
         | waitfor_statement
         | exception_statement
-        | enable_disable_statement
-                { throw SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | asm_statement
         ;
@@ -1066 +1064 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
-        | RETURN '{' initializer_list comma_opt '}'
-                { throw SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; } // FIX ME
+        | RETURN '{' initializer_list comma_opt '}'                     // FIX ME
+                { $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -1195 +1193 @@
         ;
 
-enable_disable_statement:
-        enable_disable_key identifier_list compound_statement
-        ;
-
-enable_disable_key:
-        ENABLE
-        | DISABLE
-        ;
-
 asm_statement:
         ASM asm_volatile_opt '(' string_literal ')' ';'
@@ -1403 +1392 @@
                         DeclarationNode * ret = new DeclarationNode;
                         ret->type = maybeClone( $1->type->base );
-                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr ) );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
                 }
         ;
@@ -1433 +1422 @@
                 // To obtain LR(1 ), this rule must be factored out from function return type (see cfa_abstract_declarator).
                 {
-                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0 );
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
                 }
         | cfa_function_return identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
                 {
-                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0 );
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
                 }
         ;
@@ -1892 +1881 @@
         | UNION
                 { $$ = DeclarationNode::Union; }
-        | EXCEPTION
-                { $$ = DeclarationNode::Exception; }
         | COROUTINE
                 { $$ = DeclarationNode::Coroutine; }
@@ -2003 +1990 @@
         ;
 
-cfa_parameter_type_list_opt:                                                    // CFA, abstract + real
+// Minimum of one parameter after which ellipsis is allowed only at the end.
+
+cfa_parameter_type_list_opt:                                                    // CFA
         // empty
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-        | ELLIPSIS
                 { $$ = nullptr; }
-        | cfa_abstract_parameter_list
+        | cfa_parameter_type_list
+        ;
+
+cfa_parameter_type_list:                                                                // CFA, abstract + real
+        cfa_abstract_parameter_list
         | cfa_parameter_list
         | cfa_parameter_list pop ',' push cfa_abstract_parameter_list
@@ -2039 +2030 @@
         // empty
                 { $$ = nullptr; }
-        | ELLIPSIS
-                { $$ = nullptr; }
-        | parameter_list
+        | parameter_type_list
+        ;
+
+parameter_type_list:
+        parameter_list
         | parameter_list pop ',' push ELLIPSIS
                 { $$ = $1->addVarArgs(); }