Changes in / [1afda5a2:8e64cb4]

Files:

• src/AST/Pass.hpp (modified) (1 diff)
• src/AST/Pass.impl.hpp (modified) (1 diff)
• src/GenPoly/Box.cc (modified) (6 diffs)
• src/Parser/RunParser.cpp (deleted)
• src/Parser/RunParser.hpp (deleted)
• src/Parser/module.mk (modified) (1 diff)
• src/main.cc (modified) (5 diffs)
• tests/concurrent/pthread/.expect/bounded_buffer.txt (modified) (1 diff)
• tests/concurrent/pthread/bounded_buffer.cfa (modified) (2 diffs)

src/AST/Pass.hpp

@@ -66 +66 @@
 //
 // Other Special Members:
-// | beginScope            - A method with no parameters or return value, called each time the
-//                           visitor enters a block.
-// | endScope              - A method with no parameters or return value, called each time the
-//                           visitor leaves a block.
 // | result                - Either a method that takes no parameters or a field. If a method (or
 //                           callable field) get_result calls it, otherwise the value is returned.

src/AST/Pass.impl.hpp

@@ -836 +836 @@
                         if ( enterScope ) {
                                 __pass::symtab::enter(core, 0);
+                                __pass::scope::enter(core, 0);
                         }
                 }, [this, leaveScope = !this->atFunctionTop]() {
                         if ( leaveScope ) {
                                 __pass::symtab::leave(core, 0);
+                                __pass::scope::leave(core, 0);
                         }
                 });

src/GenPoly/Box.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec 19 16:36:00 2022
-// Update Count     : 348
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:40:34 2019
+// Update Count     : 347
 //
 
@@ -214 +214 @@
                 /// sizeof expressions of polymorphic types with the proper variable,
                 /// and strips fields from generic struct declarations.
-                struct Pass3 final {
+                struct Pass3 final : public BoxPass, public WithGuards {
+                        template< typename DeclClass >
+                        void handleDecl( DeclClass * decl, Type * type );
+
                         void premutate( ObjectDecl * objectDecl );
                         void premutate( FunctionDecl * functionDecl );
@@ -220 +223 @@
                         void premutate( StructDecl * structDecl );
                         void premutate( UnionDecl * unionDecl );
+                        void premutate( TypeDecl * typeDecl );
+                        void premutate( PointerType * pointerType );
+                        void premutate( FunctionType * funcType );
                 };
         } // anonymous namespace
@@ -1880 +1886 @@
 ////////////////////////////////////////// Pass3 ////////////////////////////////////////////////////
 
+                template< typename DeclClass >
+                void Pass3::handleDecl( DeclClass * decl, Type * type ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( type, scopeTyVars );
+                        ScrubTyVars::scrubAll( decl );
+                }
+
                 void Pass3::premutate( ObjectDecl * objectDecl ) {
-                        ScrubTyVars::scrubAll( objectDecl );
+                        handleDecl( objectDecl, objectDecl->type );
                 }
 
                 void Pass3::premutate( FunctionDecl * functionDecl ) {
-                        ScrubTyVars::scrubAll( functionDecl );
+                        handleDecl( functionDecl, functionDecl->type );
                 }
 
                 void Pass3::premutate( TypedefDecl * typedefDecl ) {
-                        ScrubTyVars::scrubAll( typedefDecl );
+                        handleDecl( typedefDecl, typedefDecl->base );
                 }
 
                 /// Strips the members from a generic aggregate
-                static void stripGenericMembers( AggregateDecl * decl ) {
+                void stripGenericMembers(AggregateDecl * decl) {
                         if ( ! decl->parameters.empty() ) decl->members.clear();
                 }
@@ -1903 +1916 @@
                 void Pass3::premutate( UnionDecl * unionDecl ) {
                         stripGenericMembers( unionDecl );
+                }
+
+                void Pass3::premutate( TypeDecl * typeDecl ) {
+                        addToTyVarMap( typeDecl, scopeTyVars );
+                }
+
+                void Pass3::premutate( PointerType * pointerType ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( pointerType, scopeTyVars );
+                }
+
+                void Pass3::premutate( FunctionType * functionType ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( functionType, scopeTyVars );
                 }
         } // anonymous namespace
@@ -1912 +1939 @@
 // compile-command: "make install" //
 // End: //
+

src/Parser/module.mk

@@ -30 +30 @@
        Parser/parserutility.cc \
        Parser/parserutility.h \
-       Parser/RunParser.cpp \
-       Parser/RunParser.hpp \
        Parser/StatementNode.cc \
        Parser/TypeData.cc \

src/main.cc

@@ -59 +59 @@
 #include "InitTweak/GenInit.h"              // for genInit
 #include "MakeLibCfa.h"                     // for makeLibCfa
-#include "Parser/RunParser.hpp"             // for buildList, dumpParseTree,...
+#include "Parser/ParseNode.h"               // for DeclarationNode, buildList
+#include "Parser/TypedefTable.h"            // for TypedefTable
 #include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates
 #include "ResolvExpr/Resolver.h"            // for resolve
@@ -108 +109 @@
         Stats::Time::StopBlock();
 
+LinkageSpec::Spec linkage = LinkageSpec::Cforall;
+TypedefTable typedefTable;
+DeclarationNode * parseTree = nullptr;                                  // program parse tree
+
 static bool waiting_for_gdb = false;                                    // flag to set cfa-cpp to wait for gdb on start
 
@@ -113 +118 @@
 
 static void parse_cmdline( int argc, char * argv[] );
+static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 static void dump( ast::TranslationUnit && transUnit, ostream & out = cout );
@@ -295 +301 @@
 
                 if ( parsep ) {
-                        dumpParseTree( cout );
-                        return EXIT_SUCCESS;
-                } // if
-
-                translationUnit = buildUnit();
+                        parseTree->printList( cout );
+                        delete parseTree;
+                        return EXIT_SUCCESS;
+                } // if
+
+                buildList( parseTree, translationUnit );
+                delete parseTree;
+                parseTree = nullptr;
 
                 if ( astp ) {
@@ -739 +748 @@
 } // parse_cmdline
 
+static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit ) {
+        extern int yyparse( void );
+        extern FILE * yyin;
+        extern int yylineno;
+
+        ::linkage = linkage;                                                            // set globals
+        yyin = input;
+        yylineno = 1;
+        int parseStatus = yyparse();
+
+        fclose( input );
+        if ( shouldExit || parseStatus != 0 ) {
+                exit( parseStatus );
+        } // if
+} // parse
+
 static bool notPrelude( Declaration * decl ) {
         return ! LinkageSpec::isBuiltin( decl->get_linkage() );

tests/concurrent/pthread/.expect/bounded_buffer.txt

@@ -1 @@
-producer total value is 24150
-consumer total value is 24150
+producer total value is 23426
+consumer total value is 23426

tests/concurrent/pthread/bounded_buffer.cfa

@@ -63 +63 @@
 
 void *producer( void *arg ) {
-    Buffer(int) &buf = *(Buffer(int)*)arg;
-        const int NoOfItems = prng(*active_thread(), 40);
+        Buffer(int) &buf = *(Buffer(int)*)arg;
+        const int NoOfItems = rand() % 40;
         int item;
         for ( int i = 1; i <= NoOfItems; i += 1 ) {                     // produce a bunch of items
-                item = prng(*active_thread(), 1, 101);                  // produce a random number
+                item = rand() % 100 + 1;                                                // produce a random number
                 //sout | "Producer:" | pthread_self() | " value:" | item;
                 insert( buf,item );                                                             // insert element into queue
@@ -101 +101 @@
     pthread_mutex_init(&consumer_cnt_lock, NULL);
         // parallelism
-    set_seed( 1003 );
+    srandom( 1003 );
 
         processor p[5];