Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/DeclarationNode.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 12:34:05 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 17 15:46:33 2017 -// Update Count : 1018 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Jun 28 15:27:00 2017 +// Update Count : 1019 // @@ -1063,5 +1063,5 @@ case TypeData::Enum: case TypeData::Aggregate: { - ReferenceToType * ret = buildComAggInst( type, attributes ); + ReferenceToType * ret = buildComAggInst( type, attributes, linkage ); buildList( type->aggregate.actuals, ret->get_parameters() ); return ret; Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/ExpressionNode.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 21 16:44:46 2017 -// Update Count : 541 +// Last Modified On : Wed Jun 28 21:08:15 2017 +// Update Count : 542 // @@ -27,5 +27,5 @@ #include "SynTree/Declaration.h" #include "Common/UnimplementedError.h" -#include "parseutility.h" +#include "parserutility.h" #include "Common/utility.h" Index: src/Parser/LinkageSpec.cc =================================================================== --- src/Parser/LinkageSpec.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/LinkageSpec.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:22:09 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sun Oct 2 23:16:21 2016 -// Update Count : 23 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Jun 28 11:51:00 2017 +// Update Count : 24 // @@ -28,4 +28,6 @@ } else if ( *spec == "\"C\"" ) { return C; + } else if ( *spec == "\"BuiltinC\"" ) { + return BuiltinC; } else { throw SemanticError( "Invalid linkage specifier " + *spec ); @@ -36,14 +38,16 @@ assert( 0 <= linkage && linkage < LinkageSpec::NoOfSpecs ); static const char *linkageKinds[LinkageSpec::NoOfSpecs] = { - "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in", + "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in", "cfa built-in", "c built-in", }; return linkageKinds[linkage]; } -bool LinkageSpec::isDecoratable( Spec spec ) { +bool LinkageSpec::isMangled( Spec spec ) { assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs ); static bool decoratable[LinkageSpec::NoOfSpecs] = { - // Intrinsic, Cforall, C, AutoGen, Compiler + // Intrinsic, Cforall, C, AutoGen, Compiler, true, true, false, true, false, + // Builtin, BuiltinC, + true, false, }; return decoratable[spec]; @@ -53,6 +57,8 @@ assert( 0 <= spec && spec < LinkageSpec::NoOfSpecs ); static bool generatable[LinkageSpec::NoOfSpecs] = { - // Intrinsic, Cforall, C, AutoGen, Compiler + // Intrinsic, Cforall, C, AutoGen, Compiler, true, true, true, true, false, + // Builtin, BuiltinC, + true, true, }; return generatable[spec]; @@ -62,6 +68,8 @@ assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); static bool overridable[LinkageSpec::NoOfSpecs] = { - // Intrinsic, Cforall, C, AutoGen, Compiler + // Intrinsic, Cforall, C, AutoGen, Compiler, true, false, false, true, false, + // Builtin, BuiltinC, + false, false, }; return overridable[spec]; @@ -71,6 +79,8 @@ assert( spec >= 0 && spec < LinkageSpec::NoOfSpecs ); static bool builtin[LinkageSpec::NoOfSpecs] = { - // Intrinsic, Cforall, C, AutoGen, Compiler + // Intrinsic, Cforall, C, AutoGen, Compiler, true, false, false, false, true, + // Builtin, BuiltinC, + true, true, }; return builtin[spec]; Index: src/Parser/LinkageSpec.h =================================================================== --- src/Parser/LinkageSpec.h (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/LinkageSpec.h (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:24:28 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat Oct 1 23:03:17 2016 -// Update Count : 11 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Jun 28 11:50:00 2017 +// Update Count : 12 // @@ -26,4 +26,6 @@ AutoGen, // built by translator (struct assignment) Compiler, // gcc internal + Builtin, // mangled builtins + BuiltinC, // non-mangled builtins NoOfSpecs }; @@ -32,5 +34,5 @@ static std::string linkageName( Spec ); - static bool isDecoratable( Spec ); + static bool isMangled( Spec ); static bool isGeneratable( Spec ); static bool isOverridable( Spec ); Index: src/Parser/StatementNode.cc =================================================================== --- src/Parser/StatementNode.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/StatementNode.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 14:59:41 2015 -// Last Modified By : Andrew Beach -// Last Modified On : Mon Jun 12 13:03:00 2017 -// Update Count : 329 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Jun 28 21:08:37 2017 +// Update Count : 330 // @@ -21,5 +21,5 @@ #include "SynTree/Statement.h" #include "SynTree/Expression.h" -#include "parseutility.h" +#include "parserutility.h" #include "Common/utility.h" Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/TypeData.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 15:12:51 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Mar 17 15:52:43 2017 -// Update Count : 563 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Jun 28 15:28:00 2017 +// Update Count : 564 // @@ -614,5 +614,5 @@ } // buildPointer -AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes ) { +AggregateDecl * buildAggregate( const TypeData * td, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) { assert( td->kind == TypeData::Aggregate ); AggregateDecl * at; @@ -622,5 +622,5 @@ case DeclarationNode::Monitor: case DeclarationNode::Thread: - at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes ); + at = new StructDecl( *td->aggregate.name, td->aggregate.kind, attributes, linkage ); buildForall( td->aggregate.params, at->get_parameters() ); break; @@ -643,5 +643,5 @@ } // buildAggregate -ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes ) { +ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ) { switch ( type->kind ) { case TypeData::Enum: { @@ -656,5 +656,5 @@ ReferenceToType * ret; if ( type->aggregate.body ) { - AggregateDecl * typedecl = buildAggregate( type, attributes ); + AggregateDecl * typedecl = buildAggregate( type, attributes, linkage ); switch ( type->aggregate.kind ) { case DeclarationNode::Struct: @@ -803,5 +803,5 @@ return decl->set_asmName( asmName ); } else if ( td->kind == TypeData::Aggregate ) { - return buildAggregate( td, attributes ); + return buildAggregate( td, attributes, linkage ); } else if ( td->kind == TypeData::Enum ) { return buildEnum( td, attributes ); Index: src/Parser/TypeData.h =================================================================== --- src/Parser/TypeData.h (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/TypeData.h (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 15:18:36 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Thu Mar 16 08:32:39 2017 -// Update Count : 185 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Jun 28 15:29:00 2017 +// Update Count : 186 // @@ -102,5 +102,5 @@ ArrayType * buildArray( const TypeData * ); AggregateDecl * buildAggregate( const TypeData *, std::list< Attribute * > ); -ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes ); +ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes, LinkageSpec::Spec linkage ); ReferenceToType * buildAggInst( const TypeData * ); TypeDecl * buildVariable( const TypeData * ); Index: src/Parser/TypedefTable.h =================================================================== --- src/Parser/TypedefTable.h (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/TypedefTable.h (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:24:36 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Aug 15 18:25:04 2016 -// Update Count : 28 +// Last Modified On : Wed Jun 28 21:56:34 2017 +// Update Count : 33 // @@ -22,5 +22,5 @@ #include -#include "lex.h" +#include "parser.hh" #include "parser.h" Index: src/Parser/lex.h =================================================================== --- src/Parser/lex.h (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ (revision ) @@ -1,50 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// lex.h -- -// -// Author : Peter A. Buhr -// Created On : Sat Sep 22 08:58:10 2001 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sun Aug 21 11:28:47 2016 -// Update Count : 347 -// - -#ifndef PARSER_LEX_H -#define PARSER_LEX_H - -int yylex(); -void yyerror( const char * ); - -#include -#include "ParseNode.h" -// External declarations for information sharing between lexer and scanner -class TypedefTable; -extern TypedefTable typedefTable; - -// current location in the input -extern int yylineno; -extern char *yyfilename; - -struct Location { - char *file; - int line; -}; // Location - -struct Token { - std::string *str; // must be pointer as used in union - Location loc; - - operator std::string *() { return str; } -}; // Token - -#endif // PARSER_LEX_H - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/lex.ll (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Tue May 30 22:00:48 2017 - * Update Count : 527 + * Last Modified On : Wed Jun 28 21:03:45 2017 + * Update Count : 529 */ @@ -27,6 +27,4 @@ #include // FILENAME_MAX -#include "lex.h" -#include "parser.h" // YACC generated definitions based on C++ grammar #include "ParseNode.h" #include "TypedefTable.h" Index: src/Parser/module.mk =================================================================== --- src/Parser/module.mk (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/module.mk (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -11,6 +11,6 @@ ## Created On : Sat May 16 15:29:09 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Tue Aug 16 17:28:34 2016 -## Update Count : 101 +## Last Modified On : Wed Jun 28 21:58:29 2017 +## Update Count : 104 ############################################################################### @@ -29,5 +29,5 @@ Parser/TypeData.cc \ Parser/LinkageSpec.cc \ - Parser/parseutility.cc + Parser/parserutility.cc MAINTAINERCLEANFILES += Parser/parser.output Index: src/Parser/parser.hh =================================================================== --- src/Parser/parser.hh (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) +++ src/Parser/parser.hh (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -0,0 +1,50 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// parser.hh -- +// +// Author : Peter A. Buhr +// Created On : Sat Sep 22 08:58:10 2001 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Jun 28 22:10:17 2017 +// Update Count : 349 +// + +#ifndef PARSER_HH +#define PARSER_HH + +int yylex(); +void yyerror( const char * ); + +#include +#include "ParseNode.h" +// External declarations for information sharing between lexer and scanner +class TypedefTable; +extern TypedefTable typedefTable; + +// current location in the input +extern int yylineno; +extern char *yyfilename; + +struct Location { + char *file; + int line; +}; // Location + +struct Token { + std::string *str; // must be pointer as used in union + Location loc; + + operator std::string *() { return str; } +}; // Token + +#endif // PARSER_HH + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ src/Parser/parser.yy (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// cfa.y -- +// parser.yy -- // // Author : Peter A. Buhr // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jun 12 12:59:00 2017 -// Update Count : 2402 +// Last Modified On : Wed Jun 28 22:11:22 2017 +// Update Count : 2414 // @@ -48,6 +48,4 @@ #include #include -#include "lex.h" -#include "parser.h" #include "ParseNode.h" #include "TypedefTable.h" @@ -88,4 +86,23 @@ bool forall = false; // aggregate have one or more forall qualifiers ? %} + +// Types declaration +%union +{ + Token tok; + ParseNode * pn; + ExpressionNode * en; + DeclarationNode * decl; + DeclarationNode::Aggregate aggKey; + DeclarationNode::TypeClass tclass; + StatementNode * sn; + ConstantExpr * constant; + ForCtl * fctl; + LabelNode * label; + InitializerNode * in; + OperKinds op; + std::string * str; + bool flag; +} //************************* TERMINAL TOKENS ******************************** @@ -139,23 +156,4 @@ %token ATassign // @= - -// Types declaration -%union -{ - Token tok; - ParseNode * pn; - ExpressionNode * en; - DeclarationNode * decl; - DeclarationNode::Aggregate aggKey; - DeclarationNode::TypeClass tclass; - StatementNode * sn; - ConstantExpr * constant; - ForCtl * fctl; - LabelNode * label; - InitializerNode * in; - OperKinds op; - std::string * str; - bool flag; -} %type identifier no_attr_identifier zero_one @@ -959,5 +957,11 @@ handler_clause: - CATCH '(' push push exception_declaration pop ')' compound_statement pop + // TEMPORARY, TEST EXCEPTIONS + CATCH '(' push push INTEGERconstant pop ')' compound_statement pop + { $$ = new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$5 ) ), $8 ) ); } + | handler_clause CATCH '(' push push INTEGERconstant pop ')' compound_statement pop + { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); } + + | CATCH '(' push push exception_declaration pop ')' compound_statement pop { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); } | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop Index: src/Parser/parserutility.cc =================================================================== --- src/Parser/parserutility.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) +++ src/Parser/parserutility.cc (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -0,0 +1,36 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// parserutility.cc -- +// +// Author : Rodolfo G. Esteves +// Created On : Sat May 16 15:30:39 2015 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Jun 28 22:11:32 2017 +// Update Count : 7 +// + +#include "parserutility.h" +#include "SynTree/Type.h" +#include "SynTree/Expression.h" + +// rewrite +// if ( x ) ... +// as +// if ( (int)(x != 0) ) ... + +Expression *notZeroExpr( Expression *orig ) { + UntypedExpr *comparison = new UntypedExpr( new NameExpr( "?!=?" ) ); + comparison->get_args().push_back( orig ); + comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0", (unsigned long long int)0 ) ) ); + return new CastExpr( comparison, new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ); +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Parser/parserutility.h =================================================================== --- src/Parser/parserutility.h (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) +++ src/Parser/parserutility.h (revision a12d5aaf574b9eda122e096ee19ea16b8f778731) @@ -0,0 +1,29 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// parserutility.h -- +// +// Author : Rodolfo G. Esteves +// Created On : Sat May 16 15:31:46 2015 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Jun 28 22:11:40 2017 +// Update Count : 3 +// + +#ifndef PARSEUTILITY_H +#define PARSEUTILITY_H + +#include "SynTree/SynTree.h" + +Expression *notZeroExpr( Expression *orig ); + +#endif // PARSEUTILITY_H + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Parser/parseutility.cc =================================================================== --- src/Parser/parseutility.cc (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ (revision ) @@ -1,36 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// parseutility.cc -- -// -// Author : Rodolfo G. Esteves -// Created On : Sat May 16 15:30:39 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 21 15:33:41 2017 -// Update Count : 5 -// - -#include "parseutility.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" - -// rewrite -// if ( x ) ... -// as -// if ( (int)(x != 0) ) ... - -Expression *notZeroExpr( Expression *orig ) { - UntypedExpr *comparison = new UntypedExpr( new NameExpr( "?!=?" ) ); - comparison->get_args().push_back( orig ); - comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0", (unsigned long long int)0 ) ) ); - return new CastExpr( comparison, new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ); -} - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/Parser/parseutility.h =================================================================== --- src/Parser/parseutility.h (revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd) +++ (revision ) @@ -1,29 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// parseutility.h -- -// -// Author : Rodolfo G. Esteves -// Created On : Sat May 16 15:31:46 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat May 16 15:32:58 2015 -// Update Count : 2 -// - -#ifndef PARSEUTILITY_H -#define PARSEUTILITY_H - -#include "SynTree/SynTree.h" - -Expression *notZeroExpr( Expression *orig ); - -#endif // PARSEUTILITY_H - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: //