Changes in src/Parser/parser.yy [4ed70597:2298f728]

File:

• src/Parser/parser.yy (modified) (18 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 : Fri Aug 26 16:45:44 2016
-// Update Count     : 1964
+// Last Modified On : Sat Sep 24 11:30:40 2016
+// Update Count     : 1991
 //
 
@@ -54 +54 @@
 #include "TypeData.h"
 #include "LinkageSpec.h"
+using namespace std;
 
 extern DeclarationNode * parseTree;
@@ -59 +60 @@
 extern TypedefTable typedefTable;
 
-std::stack< LinkageSpec::Spec > linkageStack;
-
-void appendStr( std::string *to, std::string *from ) {
+stack< LinkageSpec::Spec > linkageStack;
+
+void appendStr( string *to, string *from ) {
         // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
         to->insert( to->length() - 1, from->substr( 1, from->length() - 2 ) );
@@ -359 +360 @@
                 { $$ = $2; }
         | '(' compound_statement ')'                                            // GCC, lambda expression
-        { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+                { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
         ;
 
@@ -389 +390 @@
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" ); // location undefined
+                        fn.str = new string( "?{}" );                           // location undefined
                         $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) );
                 }
@@ -666 +667 @@
                 {
                         Token fn;
-                        fn.str = new std::string( "^?{}" ); // location undefined
+                        fn.str = new string( "^?{}" );                          // location undefined
                         $$ = new StatementNode( build_expr( new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) ) ) );
                 }
@@ -896 +897 @@
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-        { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
@@ -968 +969 @@
                 { $$ = new ExpressionNode( build_asmexpr( 0, $1, $3 ) ); }
         | '[' constant_expression ']' string_literal '(' constant_expression ')'
-        { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
+                { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
         ;
 
@@ -1363 +1364 @@
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Int ); }
         | LONG
-                { $$ = DeclarationNode::newModifier( DeclarationNode::Long ); }
+                { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
         | SHORT
-                { $$ = DeclarationNode::newModifier( DeclarationNode::Short ); }
+                { $$ = DeclarationNode::newLength( DeclarationNode::Short ); }
         | SIGNED
-                { $$ = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+                { $$ = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
         | UNSIGNED
-                { $$ = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+                { $$ = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
         | VOID
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
@@ -1375 +1376 @@
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
         | COMPLEX                                                                                       // C99
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+                { $$ = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
         | IMAGINARY                                                                                     // C99
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+                { $$ = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
@@ -1467 +1468 @@
 aggregate_name:
         aggregate_key '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, nullptr, nullptr, $3, true ); }
         | aggregate_key no_attr_identifier_or_type_name
                 {
                         typedefTable.makeTypedef( *$2 );
-                        $$ = DeclarationNode::newAggregate( $1, $2, 0, 0, false );
+                        $$ = DeclarationNode::newAggregate( $1, $2, nullptr, nullptr, false );
                 }
         | aggregate_key no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$2 ); }
                 '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, nullptr, $5, true ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6, false ); }
+                { $$ = DeclarationNode::newAggregate( $1, nullptr, $3, $6, false ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1559 +1560 @@
 enum_name:
         enum_key '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( 0, $3 ); }
+                { $$ = DeclarationNode::newEnum( nullptr, $3 ); }
         | enum_key no_attr_identifier_or_type_name
                 {
@@ -1849 +1850 @@
 type_class:                                                                                             // CFA
         OTYPE
-                { $$ = DeclarationNode::Type; }
+                { $$ = DeclarationNode::Otype; }
         | DTYPE
                 { $$ = DeclarationNode::Ftype; }
@@ -2520 +2521 @@
 abstract_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( nullptr, nullptr, $3, nullptr ); }
         | '(' abstract_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2589 +2590 @@
 abstract_parameter_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( nullptr, nullptr, $3, nullptr ); }
         | '(' abstract_parameter_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2793 +2794 @@
                 // empty (void) function return type.
         '[' ']' type_specifier
-                { $$ = $3->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+                { $$ = $3->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
         | '[' ']' multi_array_dimension type_specifier
-                { $$ = $4->addNewArray( $3 )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+                { $$ = $4->addNewArray( $3 )->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
         | multi_array_dimension type_specifier
                 { $$ = $2->addNewArray( $1 ); }
         | '[' ']' new_abstract_ptr
-                { $$ = $3->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+                { $$ = $3->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
         | '[' ']' multi_array_dimension new_abstract_ptr
-                { $$ = $4->addNewArray( $3 )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
+                { $$ = $4->addNewArray( $3 )->addNewArray( DeclarationNode::newArray( nullptr, nullptr, false ) ); }
         | multi_array_dimension new_abstract_ptr
                 { $$ = $2->addNewArray( $1 ); }
@@ -2813 +2814 @@
 new_abstract_function:                                                                  // CFA
         '[' ']' '(' new_parameter_type_list_opt ')'
-                { $$ = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( nullptr, DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
         | new_abstract_tuple '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
         | new_function_return '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
         ;
 
@@ -2852 +2853 @@
 
 void yyerror( const char * ) {
-        std::cout << "Error ";
+        cout << "Error ";
         if ( yyfilename ) {
-                std::cout << "in file " << yyfilename << " ";
+                cout << "in file " << yyfilename << " ";
         } // if
-        std::cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << std::endl;
+        cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
 }