Changeset 2a8427c6

Timestamp:

Feb 22, 2018, 4:52:25 PM (7 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:

8f13c98

Parents:

4ada74e

Message:

adjust meaning of var-args for C empty parameter list

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (3 diffs)
• TypeData.cc (modified) (4 diffs)
• TypeData.h (modified) (2 diffs)
• parser.yy (modified) (11 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Nov 20 09:21:52 2017
-// Update Count     : 1031
+// Last Modified On : Thu Feb 22 15:37:17 2018
+// Update Count     : 1033
 //
 
@@ -120 +120 @@
 } // DeclarationNode::clone
 
-bool DeclarationNode::get_hasEllipsis() const {
-        return hasEllipsis;
-}
-
 void DeclarationNode::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' );
@@ -167 +163 @@
 }
 
-DeclarationNode * DeclarationNode::newFunction( string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle ) {
+DeclarationNode * DeclarationNode::newFunction( string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->name = name;
         newnode->type = new TypeData( TypeData::Function );
         newnode->type->function.params = param;
-        newnode->type->function.newStyle = newStyle;
         newnode->type->function.body = body;
 

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Nov 27 17:33:35 2017
-// Update Count     : 824
+// Last Modified On : Thu Feb 22 15:31:48 2018
+// Update Count     : 826
 //
 
@@ -226 +226 @@
         static DeclarationNode * newForall( DeclarationNode * );
         static DeclarationNode * newFromTypedef( std::string * );
-        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle = false );
+        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
         static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants, bool body );
@@ -288 +288 @@
         Type * buildType() const;
 
-        bool get_hasEllipsis() const;
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode * extractAggregate() const;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 18:33:41 2017
-// Update Count     : 587
+// Last Modified On : Thu Feb 22 15:49:00 2018
+// Update Count     : 597
 //
 
@@ -54 +54 @@
                 function.oldDeclList = nullptr;
                 function.body = nullptr;
-                function.newStyle = false;
                 function.withExprs = nullptr;
                 break;
@@ -195 +194 @@
                 newtype->function.oldDeclList = maybeClone( function.oldDeclList );
                 newtype->function.body = maybeClone( function.body );
-                newtype->function.newStyle = function.newStyle;
                 newtype->function.withExprs = maybeClone( function.withExprs );
                 break;
@@ -881 +879 @@
 FunctionType * buildFunction( const TypeData * td ) {
         assert( td->kind == TypeData::Function );
-        bool hasEllipsis = td->function.params ? td->function.params->get_hasEllipsis() : true;
-        if ( ! td->function.params ) hasEllipsis = ! td->function.newStyle;
-        FunctionType * ft = new FunctionType( buildQualifiers( td ), hasEllipsis );
+        FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
         buildList( td->function.params, ft->get_parameters() );
         buildForall( td->forall, ft->get_forall() );

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep  1 23:33:45 2017
-// Update Count     : 190
+// Last Modified On : Thu Feb 22 15:21:23 2018
+// Update Count     : 191
 //
 
@@ -64 +64 @@
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
-                bool newStyle;
                 ExpressionNode * withExprs;             // expressions from function's with_clause
         };

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 15 17:12:31 2018
-// Update Count     : 3006
+// Last Modified On : Thu Feb 22 15:31:19 2018
+// Update Count     : 3027
 //
 
@@ -314 +314 @@
 %type<decl> cfa_identifier_parameter_declarator_tuple cfa_identifier_parameter_ptr
 
-%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list cfa_parameter_type_list_opt
+%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list_opt
 
 %type<decl> cfa_typedef_declaration cfa_variable_declaration cfa_variable_specifier
@@ -322 +322 @@
 %type<decl> KR_declaration_list KR_declaration_list_opt
 
-%type<decl> parameter_declaration parameter_list parameter_type_list
-%type<decl> parameter_type_list_opt
+%type<decl> parameter_declaration parameter_list parameter_type_list_opt
 
 %type<decl> paren_identifier paren_type
@@ -779 +778 @@
         | unary_expression assignment_operator assignment_expression
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
-        | unary_expression '=' '{' initializer_list comma_opt '}' // FIX ME
-                { $$ = nullptr; }
+        | unary_expression '=' '{' initializer_list comma_opt '}'
+                { throw SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; } // FIX ME
         ;
 
@@ -849 +848 @@
         | waitfor_statement
         | exception_statement
+        | enable_disable_statement
+                { throw SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | asm_statement
         ;
@@ -1064 +1065 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
-        | RETURN '{' initializer_list comma_opt '}'                     // FIX ME
-                { $$ = nullptr; }
+        | RETURN '{' initializer_list comma_opt '}'
+                { throw SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -1193 +1194 @@
         ;
 
+enable_disable_statement:
+        enable_disable_key identifier_list compound_statement
+        ;
+
+enable_disable_key:
+        ENABLE
+        | DISABLE
+        ;
+
 asm_statement:
         ASM asm_volatile_opt '(' string_literal ')' ';'
@@ -1392 +1402 @@
                         DeclarationNode * ret = new DeclarationNode;
                         ret->type = maybeClone( $1->type->base );
-                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr ) );
                 }
         ;
@@ -1422 +1432 @@
                 // To obtain LR(1 ), this rule must be factored out from function return type (see cfa_abstract_declarator).
                 {
-                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0 );
                 }
         | cfa_function_return identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
                 {
-                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0 );
                 }
         ;
@@ -1990 +2000 @@
         ;
 
-// Minimum of one parameter after which ellipsis is allowed only at the end.
-
-cfa_parameter_type_list_opt:                                                    // CFA
+cfa_parameter_type_list_opt:                                                    // CFA, abstract + real
         // empty
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+        | ELLIPSIS
                 { $$ = nullptr; }
-        | cfa_parameter_type_list
-        ;
-
-cfa_parameter_type_list:                                                                // CFA, abstract + real
-        cfa_abstract_parameter_list
+        | cfa_abstract_parameter_list
         | cfa_parameter_list
         | cfa_parameter_list pop ',' push cfa_abstract_parameter_list
@@ -2030 +2036 @@
         // empty
                 { $$ = nullptr; }
-        | parameter_type_list
-        ;
-
-parameter_type_list:
-        parameter_list
+        | ELLIPSIS
+                { $$ = nullptr; }
+        | parameter_list
         | parameter_list pop ',' push ELLIPSIS
                 { $$ = $1->addVarArgs(); }