Changeset 926af74 for src/Parser

Timestamp:

Aug 17, 2016, 9:31:28 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3b8e52c, 6643e72

Parents:

5ead9f9

Message:

more refactoring of parser code

Location:

src/Parser

Files:

• TypeData.cc (modified) (2 diffs)
• lex.cc (modified) (2 diffs)
• lex.ll (modified) (2 diffs)
• parser.cc (modified) (5 diffs)
• parser.yy (modified) (6 diffs)

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 Aug 15 20:48:52 2016
-// Update Count     : 62
+// Last Modified On : Wed Aug 17 08:47:48 2016
+// Update Count     : 63
 //
 
@@ -908 +908 @@
         buildList( enumeration->constants, ret->get_members() );
         std::list< Declaration * >::iterator members = ret->get_members().begin();
-        for ( const DeclarationNode *cur = enumeration->constants; cur != NULL; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( cur->get_enumeratorValue() != NULL ) {
+        for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
+                if ( cur->get_enumeratorValue() != nullptr ) {
                         ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members);
                         member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) );

src/Parser/lex.cc ¶

@@ -1468 +1468 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Tue Aug 16 22:34:31 2016
+ * Update Count     : 460
  */
 #line 20 "lex.ll"
@@ -1491 +1491 @@
 #define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 

src/Parser/lex.ll ¶

@@ -9 +9 @@
  * Author           : Peter A. Buhr
  * Created On       : Sat Sep 22 08:58:10 2001
- * Last Modified By : 
- * Last Modified On : Sun Jul 31 07:19:36 2016
- * Update Count     : 459
+ * Last Modified By : Peter A. Buhr
+ * Last Modified On : Tue Aug 16 22:34:31 2016
+ * Update Count     : 460
  */
 
@@ -36 +36 @@
 #define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
 #define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
-#define RETURN_CHAR(x)          yylval.tok.str = NULL; RETURN_LOCN( x )
+#define RETURN_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 

src/Parser/parser.cc ¶

@@ -5709 +5709 @@
 #line 700 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
@@ -7047 +7047 @@
 #line 1494 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         (yyval.decl) = (yyvsp[(2) - (3)].decl);
@@ -7772 +7772 @@
 /* Line 1806 of yacc.c  */
 #line 1972 "parser.yy"
-    { parseTree = parseTree ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);       }
+    { parseTree = parseTree != nullptr ? parseTree->appendList( (yyvsp[(1) - (1)].decl) ) : (yyvsp[(1) - (1)].decl);    }
     break;
 
@@ -7779 +7779 @@
 /* Line 1806 of yacc.c  */
 #line 1978 "parser.yy"
-    { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
+    { (yyval.decl) = (yyvsp[(1) - (3)].decl) != nullptr ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
 
@@ -7822 +7822 @@
 #line 2004 "parser.yy"
     {   // mark all fields in list
-                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         (yyval.decl) = (yyvsp[(2) - (2)].decl);

src/Parser/parser.yy ¶

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 21:31:46 2016
-// Update Count     : 1906
+// Last Modified On : Tue Aug 16 21:59:35 2016
+// Update Count     : 1907
 //
 
@@ -699 +699 @@
         | EXTENSION declaration                                                         // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = new StatementNode( $2 );
@@ -1493 +1493 @@
         | EXTENSION field_declaring_list ';'                            // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;
@@ -1970 +1970 @@
                 {}                                                                                              // empty input file
         | external_definition_list
-                { parseTree = parseTree ? parseTree->appendList( $1 ) : $1;     }
+                { parseTree = parseTree != nullptr ? parseTree->appendList( $1 ) : $1;  }
         ;
 
@@ -1976 +1976 @@
         external_definition
         | external_definition_list push external_definition
-                { $$ = ( $1 != NULL ) ? $1->appendList( $3 ) : $3; }
+                { $$ = $1 != nullptr ? $1->appendList( $3 ) : $3; }
         ;
 
@@ -2003 +2003 @@
         | EXTENSION external_definition
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;