Changeset 07de76b for src/Parser

Timestamp:

Dec 16, 2019, 2:30:41 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:

bffcd66

Parents:

ab5c0008

git-author:

Peter A. Buhr <pabuhr@…> (12/16/19 14:23:00)

git-committer:

Peter A. Buhr <pabuhr@…> (12/16/19 14:30:41)

Message:

remove file TypeVar?.h* and put TypeVar::Kind into TypeDecl?, move LinkageSpec?.* from directory Parse to SynTree?

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (8 diffs)
• ParseNode.h (modified) (5 diffs)
• TypeData.cc (modified) (3 diffs)
• TypeData.h (modified) (2 diffs)
• module.mk (modified) (2 diffs)
• parser.yy (modified) (4 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 07:40:14 2019
-// Update Count     : 1123
+// Last Modified On : Mon Dec 16 09:32:40 2019
+// Update Count     : 1132
 //
 
@@ -24 +24 @@
 #include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for maybeClone, maybeBuild, CodeLocation
-#include "Parser/LinkageSpec.h"    // for Spec, linkageName, Cforall
 #include "Parser/ParseNode.h"      // for DeclarationNode, ExpressionNode
+#include "SynTree/LinkageSpec.h"   // for Spec, linkageName, Cforall
 #include "SynTree/Attribute.h"     // for Attribute
 #include "SynTree/Declaration.h"   // for TypeDecl, ObjectDecl, Declaration
@@ -47 +47 @@
 const char * DeclarationNode::signednessNames[] = { "signed", "unsigned", "NoSignednessNames" };
 const char * DeclarationNode::lengthNames[] = { "short", "long", "long long", "NoLengthNames" };
-const char * DeclarationNode::typeClassNames[] = { "otype", "dtype", "ftype", "NoTypeClassNames" };
 const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "__auto_type", "zero_t", "one_t", "NoBuiltinTypeNames" };
 
@@ -58 +57 @@
 
 //      variable.name = nullptr;
-        variable.tyClass = NoTypeClass;
+        variable.tyClass = TypeDecl::NUMBER_OF_KINDS;
         variable.assertions = nullptr;
         variable.initializer = nullptr;
@@ -312 +311 @@
 } // DeclarationNode::newFromTypeGen
 
-DeclarationNode * DeclarationNode::newTypeParam( TypeClass tc, const string * name ) {
+DeclarationNode * DeclarationNode::newTypeParam( TypeDecl::Kind tc, const string * name ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
@@ -670 +669 @@
 
 DeclarationNode * DeclarationNode::addAssertions( DeclarationNode * assertions ) {
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 if ( variable.assertions ) {
                         variable.assertions->appendList( assertions );
@@ -875 +874 @@
 
 DeclarationNode * DeclarationNode::addTypeInitializer( DeclarationNode * init ) {
-        assertf( variable.tyClass != NoTypeClass, "Called addTypeInitializer on something that isn't a type variable." );
+        assertf( variable.tyClass != TypeDecl::NUMBER_OF_KINDS, "Called addTypeInitializer on something that isn't a type variable." );
         variable.initializer = init;
         return this;
@@ -1074 +1073 @@
         } // if
 
-        if ( variable.tyClass != NoTypeClass ) {
+        if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 // otype is internally converted to dtype + otype parameters
                 static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype };
-                assertf( sizeof(kindMap)/sizeof(kindMap[0]) == NoTypeClass, "DeclarationNode::build: kindMap is out of sync." );
+                static_assert( sizeof(kindMap)/sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 07:40:07 2019
-// Update Count     : 882
+// Last Modified On : Mon Dec 16 07:46:01 2019
+// Update Count     : 888
 //
 
@@ -28 +28 @@
 #include "Common/UniqueName.h"     // for UniqueName
 #include "Common/utility.h"        // for maybeClone, maybeBuild
-#include "Parser/LinkageSpec.h"    // for Spec
+#include "SynTree/LinkageSpec.h"   // for Spec
 #include "SynTree/Declaration.h"   // for Aggregate
 #include "SynTree/Expression.h"    // for Expression, ConstantExpr (ptr only)
@@ -218 +218 @@
         enum Length { Short, Long, LongLong, NoLength };
         static const char * lengthNames[];
-        enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
-        static const char * typeClassNames[];
         enum BuiltinType { Valist, AutoType, Zero, One, NoBuiltinType };
         static const char * builtinTypeNames[];
@@ -241 +239 @@
         static DeclarationNode * newName( const std::string * );
         static DeclarationNode * newFromTypeGen( const std::string *, ExpressionNode * params );
-        static DeclarationNode * newTypeParam( TypeClass, const std::string * );
+        static DeclarationNode * newTypeParam( TypeDecl::Kind, const std::string * );
         static DeclarationNode * newTrait( const std::string * name, DeclarationNode * params, DeclarationNode * asserts );
         static DeclarationNode * newTraitUse( const std::string * name, ExpressionNode * params );
@@ -311 +309 @@
         struct Variable_t {
 //              const std::string * name;
-                DeclarationNode::TypeClass tyClass;
+                TypeDecl::Kind tyClass;
                 DeclarationNode * assertions;
                 DeclarationNode * initializer;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 07:48:33 2019
-// Update Count     : 659
+// Last Modified On : Mon Dec 16 07:56:46 2019
+// Update Count     : 662
 //
 
@@ -489 +489 @@
         for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i, n = (DeclarationNode*)n->get_next() ) {
                 TypeDecl * td = static_cast<TypeDecl *>(*i);
-                if ( n->variable.tyClass == DeclarationNode::Otype ) {
+                if ( n->variable.tyClass == TypeDecl::Otype ) {
                         // add assertion parameters to `type' tyvars in reverse order
                         // add dtor:  void ^?{}(T *)
@@ -522 +522 @@
         switch ( td->kind ) {
           case TypeData::Unknown:
-                        // fill in implicit int
-                        return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
+                // fill in implicit int
+                return new BasicType( buildQualifiers( td ), BasicType::SignedInt );
           case TypeData::Basic:
-                        return buildBasicType( td );
+                return buildBasicType( td );
           case TypeData::Pointer:
-                        return buildPointer( td );
+                return buildPointer( td );
           case TypeData::Array:
-                        return buildArray( td );
+                return buildArray( td );
           case TypeData::Reference:
-                        return buildReference( td );
+                return buildReference( td );
           case TypeData::Function:
-                        return buildFunction( td );
+                return buildFunction( td );
           case TypeData::AggregateInst:
-                        return buildAggInst( td );
+                return buildAggInst( td );
           case TypeData::EnumConstant:
-                        // the name gets filled in later -- by SymTab::Validate
-                        return new EnumInstType( buildQualifiers( td ), "" );
+                // the name gets filled in later -- by SymTab::Validate
+                return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
-                        return buildSymbolicInst( td );
+                return buildSymbolicInst( td );
           case TypeData::Tuple:
-                        return buildTuple( td );
+                return buildTuple( td );
           case TypeData::Typeof:
           case TypeData::Basetypeof:
-                        return buildTypeof( td );
+                return buildTypeof( td );
           case TypeData::Builtin:
-                        if (td->builtintype == DeclarationNode::Zero) {
-                                return new ZeroType( noQualifiers );
-                        }
-                        else if (td->builtintype == DeclarationNode::One) {
-                                return new OneType( noQualifiers );
-                        }
-                        else {
-                                return new VarArgsType( buildQualifiers( td ) );
-                        }
+                switch ( td->builtintype ) {
+                  case DeclarationNode::Zero:
+                        return new ZeroType( noQualifiers );
+                  case DeclarationNode::One:
+                        return new OneType( noQualifiers );
+                  default:
+                        return new VarArgsType( buildQualifiers( td ) );
+                } // switch
           case TypeData::GlobalScope:
-                        return new GlobalScopeType();
-                case TypeData::Qualified:
-                        return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
+                return new GlobalScopeType();
+          case TypeData::Qualified:
+                return new QualifiedType( buildQualifiers( td ), typebuild( td->qualified.parent ), typebuild( td->qualified.child ) );
           case TypeData::Symbolic:
           case TypeData::Enum:
           case TypeData::Aggregate:
-                        assert( false );
+                assert( false );
         } // switch
 

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 10 23:01:07 2019
-// Update Count     : 198
+// Last Modified On : Fri Dec 13 23:42:35 2019
+// Update Count     : 199
 //
 
@@ -21 +21 @@
 
 #include "ParseNode.h"           // for DeclarationNode, DeclarationNode::Ag...
-#include "Parser/LinkageSpec.h"  // for Spec
+#include "SynTree/LinkageSpec.h" // for Spec
 #include "SynTree/Type.h"        // for Type, ReferenceToType (ptr only)
 #include "SynTree/SynTree.h"     // for Visitor Nodes

src/Parser/module.mk

@@ -11 +11 @@
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Jun 28 21:58:29 2017
-## Update Count     : 104
+## Last Modified On : Sat Dec 14 07:34:47 2019
+## Update Count     : 107
 ###############################################################################
 
@@ -19 +19 @@
 AM_YFLAGS = -d -t -v
 
-SRC += Parser/parser.yy \
-       Parser/lex.ll \
-       Parser/TypedefTable.cc \
-       Parser/ParseNode.cc \
+SRC += \
        Parser/DeclarationNode.cc \
        Parser/ExpressionNode.cc \
+       Parser/InitializerNode.cc \
+       Parser/ParseNode.cc \
        Parser/StatementNode.cc \
-       Parser/InitializerNode.cc \
        Parser/TypeData.cc \
-       Parser/LinkageSpec.cc \
+       Parser/TypedefTable.cc \
+       Parser/lex.ll \
+       Parser/parser.yy \
        Parser/parserutility.cc
 
-SRCDEMANGLE += \
-        Parser/LinkageSpec.cc
-
-
 MOSTLYCLEANFILES += Parser/lex.cc Parser/parser.cc Parser/parser.hh Parser/parser.output

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 12 17:54:22 2019
-// Update Count     : 4404
+// Last Modified On : Mon Dec 16 07:45:59 2019
+// Update Count     : 4408
 //
 
@@ -55 +55 @@
 #include "TypedefTable.h"
 #include "TypeData.h"
-#include "LinkageSpec.h"
+#include "SynTree/LinkageSpec.h"
 #include "Common/SemanticError.h"                                               // error_str
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
@@ -238 +238 @@
         DeclarationNode * decl;
         AggregateDecl::Aggregate aggKey;
-        DeclarationNode::TypeClass tclass;
+        TypeDecl::Kind tclass;
         StatementNode * sn;
         WaitForStmt * wfs;
@@ -2437 +2437 @@
         | type_specifier identifier_parameter_declarator
         | assertion_list
-                { $$ = DeclarationNode::newTypeParam( DeclarationNode::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
+                { $$ = DeclarationNode::newTypeParam( TypeDecl::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
         ;
 
 type_class:                                                                                             // CFA
         OTYPE
-                { $$ = DeclarationNode::Otype; }
+                { $$ = TypeDecl::Otype; }
         | DTYPE
-                { $$ = DeclarationNode::Dtype; }
+                { $$ = TypeDecl::Dtype; }
         | FTYPE
-                { $$ = DeclarationNode::Ftype; }
+                { $$ = TypeDecl::Ftype; }
         | TTYPE
-                { $$ = DeclarationNode::Ttype; }
+                { $$ = TypeDecl::Ttype; }
         ;