- Timestamp:
- Aug 4, 2021, 2:40:11 PM (4 years ago)
- Branches:
- ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- 199894e
- Parents:
- 0640189e (diff), df5b2c8 (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. - Location:
- src
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
src/CompilationState.cc
r0640189e r5541ea3d 9 9 // Author : Rob Schluntz 10 10 // Created On : Mon Ju1 30 10:47:01 2018 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Fri May 3 13:45:23 201913 // Update Count : 411 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Jul 20 04:27:35 2021 13 // Update Count : 5 14 14 // 15 15 … … 23 23 ctorinitp = false, 24 24 declstatsp = false, 25 exdeclp = false, 25 26 exprp = false, 26 27 expraltp = false, -
src/CompilationState.h
r0640189e r5541ea3d 9 9 // Author : Rob Schluntz 10 10 // Created On : Mon Ju1 30 10:47:01 2018 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Fri May 3 13:43:21 201913 // Update Count : 411 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Jul 20 04:27:35 2021 13 // Update Count : 5 14 14 // 15 15 … … 22 22 ctorinitp, 23 23 declstatsp, 24 exdeclp, 24 25 exprp, 25 26 expraltp, -
src/ControlStruct/ExceptTranslate.cc
r0640189e r5541ea3d 9 9 // Author : Andrew Beach 10 10 // Created On : Wed Jun 14 16:49:00 2017 11 // Last Modified By : Andrew Beach12 // Last Modified On : Wed Jun 24 11:18:00 202013 // Update Count : 1 711 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Aug 03 10:05:51 2021 13 // Update Count : 18 14 14 // 15 15 … … 320 320 static_cast<ObjectDecl *>( handler->get_decl() ); 321 321 ObjectDecl * local_except = handler_decl->clone(); 322 local_except->set_init( 323 new ListInit({ new SingleInit( 324 new VirtualCastExpr( nameOf( except_obj ), 325 local_except->get_type() 326 ) 327 ) }) 322 VirtualCastExpr * vcex = new VirtualCastExpr( 323 nameOf( except_obj ), 324 local_except->get_type() 328 325 ); 326 vcex->location = handler->location; 327 local_except->set_init( new ListInit({ new SingleInit( vcex ) }) ); 329 328 block->push_back( new DeclStmt( local_except ) ); 330 329 … … 392 391 393 392 // Check for type match. 394 Expression * cond = UntypedExpr::createAssign( nameOf( local_except ), 395 new VirtualCastExpr( nameOf( except_obj ), 396 local_except->get_type()->clone() ) ); 393 VirtualCastExpr * vcex = new VirtualCastExpr( 394 nameOf( except_obj ), 395 local_except->get_type()->clone() 396 ); 397 vcex->location = modded_handler->location; 398 Expression * cond = UntypedExpr::createAssign( 399 nameOf( local_except ), vcex ); 397 400 398 401 // Add the check on the conditional if it is provided. -
src/ControlStruct/module.mk
r0640189e r5541ea3d 10 10 ## Author : Richard C. Bilson 11 11 ## Created On : Mon Jun 1 17:49:17 2015 12 ## Last Modified By : Andrew Beach13 ## Last Modified On : Wed Jun 28 16:15:00 201714 ## Update Count : 412 ## Last Modified By : Henry Xue 13 ## Last Modified On : Tue Jul 20 04:10:50 2021 14 ## Update Count : 5 15 15 ############################################################################### 16 16 17 17 SRC_CONTROLSTRUCT = \ 18 ControlStruct/ExceptDecl.cc \ 19 ControlStruct/ExceptDecl.h \ 18 20 ControlStruct/ForExprMutator.cc \ 19 21 ControlStruct/ForExprMutator.h \ -
src/Parser/TypeData.cc
r0640189e r5541ea3d 9 9 // Author : Rodolfo G. Esteves 10 10 // Created On : Sat May 16 15:12:51 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Wed Jul 14 18:57:31202113 // Update Count : 67 211 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Jul 20 04:10:50 2021 13 // Update Count : 673 14 14 // 15 15 … … 778 778 case AggregateDecl::Struct: 779 779 case AggregateDecl::Coroutine: 780 case AggregateDecl::Exception: 780 781 case AggregateDecl::Generator: 781 782 case AggregateDecl::Monitor: -
src/Parser/parser.yy
r0640189e r5541ea3d 10 10 // Created On : Sat Sep 1 20:22:55 2001 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Wed Jul 14 17:27:54 202113 // Update Count : 503 012 // Last Modified On : Tue Jul 20 22:03:04 2021 13 // Update Count : 5031 14 14 // 15 15 … … 1923 1923 1924 1924 vtable: 1925 VTABLE '(' type def_name ')' default_opt1925 VTABLE '(' type_name ')' default_opt 1926 1926 { $$ = DeclarationNode::newVtableType( $3 ); } 1927 1927 // { SemanticError( yylloc, "vtable is currently unimplemented." ); $$ = nullptr; } -
src/SynTree/Declaration.h
r0640189e r5541ea3d 9 9 // Author : Richard C. Bilson 10 10 // Created On : Mon May 18 07:44:20 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Fri Mar 12 18:35:36202113 // Update Count : 1 5911 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Jul 20 04:10:50 2021 13 // Update Count : 160 14 14 // 15 15 … … 300 300 301 301 bool is_coroutine() { return kind == Coroutine; } 302 bool is_exception() { return kind == Exception; } 302 303 bool is_generator() { return kind == Generator; } 303 304 bool is_monitor () { return kind == Monitor ; } -
src/main.cc
r0640189e r5541ea3d 9 9 // Author : Peter Buhr and Rob Schluntz 10 10 // Created On : Fri May 15 23:12:02 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Sat Mar 6 15:49:00202113 // Update Count : 65 611 // Last Modified By : Henry Xue 12 // Last Modified On : Tue Jul 20 04:27:35 2021 13 // Update Count : 658 14 14 // 15 15 … … 49 49 #include "Common/utility.h" // for deleteAll, filter, printAll 50 50 #include "Concurrency/Waitfor.h" // for generateWaitfor 51 #include "ControlStruct/ExceptDecl.h" // for translateExcept 51 52 #include "ControlStruct/ExceptTranslate.h" // for translateEHM 52 53 #include "ControlStruct/Mutate.h" // for mutate … … 305 306 CodeTools::fillLocations( translationUnit ); 306 307 Stats::Time::StopBlock(); 308 309 PASS( "Translate Exception Declarations", ControlStruct::translateExcept( translationUnit ) ); 310 if ( exdeclp ) { 311 dump( translationUnit ); 312 return EXIT_SUCCESS; 313 } // if 307 314 308 315 // add the assignment statement after the initialization of a type parameter … … 549 556 // code dumps 550 557 { "ast", astp, true, "print AST after parsing" }, 558 { "exdecl", exdeclp, true, "print AST after translating exception decls" }, 551 559 { "symevt", symtabp, true, "print AST after symbol table events" }, 552 560 { "altexpr", expraltp, true, "print alternatives for expressions" },
Note:
See TracChangeset
for help on using the changeset viewer.