Changeset 10cb642

Timestamp:

Aug 6, 2019, 12:43:31 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f4f9d27

Parents:

c63d48f

git-author:

Peter A. Buhr <pabuhr@…> (08/06/19 12:42:53)

git-committer:

Peter A. Buhr <pabuhr@…> (08/06/19 12:43:31)

Message:

change BasicTypes?-gen to also rewrite SynTree/Type?.h

Location:

src

Files:

• BasicTypes-gen.cc (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)

src/BasicTypes-gen.cc

@@ -273 +273 @@
 
 
-        #define Type TOP_SRCDIR "src/AST/Type.hpp"
+        #define Type TOP_SRCDIR "src/SynTree/Type.h"
         resetInput( file, Type, buffer, code, str );
 
@@ -295 +295 @@
         // cout << code.str();
 
-        
+
+        // TEMPORARY DURING CHANGE OVER
+        #define TypeAST TOP_SRCDIR "src/AST/Type.hpp"
+        resetInput( file, TypeAST, buffer, code, str );
+
+        if ( (start = str.find( STARTMK )) == string::npos ) Abort( "start", TypeAST );
+        start += sizeof( STARTMK );                                                     // includes newline
+        code << str.substr( 0, start );
+
+        code << "\t" << BYMK << endl;
+        code << "\tenum Kind {" << endl;
+        for ( int r = 0; r < NUMBER_OF_BASIC_TYPES; r += 1 ) {
+                code << "\t\t" << graph[r].name << "," << endl;
+        } // for        
+        code << "\t\tNUMBER_OF_BASIC_TYPES" << endl;
+        code << "\t} kind;" << endl;
+        code << "\t";                                                                           // indentation for end marker
+
+        if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", TypeAST );
+        code << str.substr( start );
+
+        output( file, TypeAST, code );
+        // cout << code.str();
+
+
         #define ConversionCost TOP_SRCDIR "src/ResolvExpr/ConversionCost.cc"
         resetInput( file, ConversionCost, buffer, code, str );
@@ -310 +334 @@
                         code << right << setw(30) << graph[c].type << left;
                 } else if ( graph[c].rank != graph[c + 2].rank ) {
-                        code << string( 10, ' ' ) << setw(25) << graph[c].type << setw(25) << graph[c + 1].type;
+                        code << string( 10, ' ' ) << setw(25) << graph[c].type << graph[c + 1].type;
                         c += 1;
                 } else {
-                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << setw(20) << graph[c + 2].type;
+                        code << setw(20) << graph[c].type << setw(20) << graph[c + 1].type << graph[c + 2].type;
                         c += 2;
                 } // if

src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Feb 15 09:44:09 2019
-## Update Count     : 97
+## Last Modified On : Mon Aug  5 12:57:46 2019
+## Update Count     : 98
 ###############################################################################
 
@@ -55 +55 @@
 $(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
 
-$(srcdir)/SynTree/Type.h : BasicTypes-gen.cc
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
         ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
         @./BasicTypes-gen

src/Makefile.in

@@ -1666 +1666 @@
 $(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
 
-$(srcdir)/SynTree/Type.h : BasicTypes-gen.cc
+$(srcdir)/AST/Type.hpp : BasicTypes-gen.cc
         ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
         @./BasicTypes-gen