Changeset 11ab8ea8

Timestamp:

May 19, 2017, 3:44:49 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

88e0080

Parents:

d298e03

Message:

add checks for generic type parameter length

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -208 +208 @@
         };
 
+        /// ensure that generic types have the correct number of type arguments
+        class ValidateGenericParameters : public Visitor {
+        public:
+                typedef Visitor Parent;
+                virtual void visit( StructInstType * inst ) final override;
+                virtual void visit( UnionInstType * inst ) final override;
+        };
+
         class ArrayLength : public Visitor {
         public:
@@ -235 +243 @@
                 Pass3 pass3( 0 );
                 CompoundLiteral compoundliteral;
-
-                HoistStruct::hoistStruct( translationUnit );
+                ValidateGenericParameters genericParams;
+
                 EliminateTypedef::eliminateTypedef( translationUnit );
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
                 acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
@@ -829 +839 @@
         }
 
+        template< typename Aggr >
+        void validateGeneric( Aggr * inst ) {
+                std::list< TypeDecl * > * params = inst->get_baseParameters();
+                if ( params != NULL ) {
+                        std::list< Expression * > & args = inst->get_parameters();
+                        if ( args.size() < params->size() ) throw SemanticError( "Too few type arguments in generic type ", inst );
+                        if ( args.size() > params->size() ) throw SemanticError( "Too many type arguments in generic type ", inst );
+                }
+        }
+
+        void ValidateGenericParameters::visit( StructInstType * inst ) {
+                validateGeneric( inst );
+                Parent::visit( inst );
+        }
+
+        void ValidateGenericParameters::visit( UnionInstType * inst ) {
+                validateGeneric( inst );
+                Parent::visit( inst );
+        }
+
         DeclarationWithType * CompoundLiteral::mutate( ObjectDecl *objectDecl ) {
                 storageClasses = objectDecl->get_storageClasses();