Changeset 779a4a3 for src/Parser

Timestamp:

May 3, 2018, 4:33:19 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into fix-reference-overloading

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• StatementNode.cc (modified) (3 diffs)
• lex.ll (modified) (2 diffs)
• parser.yy (modified) (5 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:04:05 2018
-// Update Count     : 830
+// Last Modified On : Mon Apr 30 09:19:17 2018
+// Update Count     : 831
 //
 
@@ -416 +416 @@
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
-Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
-Statement * build_dirstmt( std::string * directive );
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
+Statement * build_directive( std::string * directive );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when, WaitForStmt * existing );

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:21:45 2018
-// Update Count     : 353
+// Last Modified On : Mon Apr 30 09:21:16 2018
+// Update Count     : 354
 //
 
@@ -310 +310 @@
 }
 
-Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
         std::list< Expression * > out, in;
         std::list< ConstantExpr * > clob;
@@ -320 +320 @@
 }
 
-Statement * build_dirstmt( string * directive ) {
-        cout << *directive << endl;
-        return nullptr;
+Statement * build_directive( string * directive ) {
+        return new DirectiveStmt( *directive );
 }
 

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sun Apr 29 14:10:49 2018
- * Update Count     : 675
+ * Last Modified On : Thu May  3 13:42:40 2018
+ * Update Count     : 676
  */
 
@@ -174 +174 @@
 }
 
-                                /* ignore preprocessor-style directives (for now) */
+                                /* preprocessor-style directives */
 ^{h_white}*"#"[^\n]*"\n" { RETURN_VAL( DIRECTIVE ); }
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 29 14:20:17 2018
-// Update Count     : 3206
+// Last Modified On : Thu May  3 08:20:09 2018
+// Update Count     : 3225
 //
 
@@ -877 +877 @@
         | asm_statement
         | DIRECTIVE
-                { $$ = new StatementNode( build_dirstmt( $1 ) ); }
+                { $$ = new StatementNode( build_directive( $1 ) ); }
         ;
 
@@ -1207 +1207 @@
 asm_statement:
         ASM asm_volatile_opt '(' string_literal ')' ';'
-                { $$ = new StatementNode( build_asmstmt( $2, $4, 0 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, 0 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ')' ';' // remaining GCC
-                { $$ = new StatementNode( build_asmstmt( $2, $4, $6 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ')' ';'
-                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6, $8 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
-                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8, $10 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6, $8, $10 ) ); }
         | ASM asm_volatile_opt GOTO '(' string_literal ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-                { $$ = new StatementNode( build_asmstmt( $2, $5, 0, $8, $10, $12 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $5, 0, $8, $10, $12 ) ); }
         ;
 
@@ -2405 +2405 @@
         | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
                 {
-                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asmstmt( false, $3, 0 ) ) );
+                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asm( false, $3, 0 ) ) );
                 }
         | EXTERN STRINGliteral                                                          // C++-style linkage specifier
@@ -2451 +2451 @@
         | declaration_qualifier_list type_qualifier_list
                 {
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
+                        // forall must be in the type_qualifier_list
+                        if ( $2->type->forall ) xxx = forall = true; // remember generic type
                 }
           push '{' external_definition_list '}'                         // CFA, namespace