Handle (templated) functions with packed parameters

usiems · mrbean-bremen · commit 63d26037ec93 · 2023-11-24T14:21:06.000+01:00
diff --git a/generator/parser/ast.h b/generator/parser/ast.h
@@ -384,6 +384,7 @@ struct DeclaratorAST: public AST
   const ListNode<std::size_t> *fun_cv{};
   ExceptionSpecificationAST *exception_spec{};
   bool _override{};
+  bool packedParameter{};
   ValueReferenceEnum valueRef{ UnspecifiedRef };
 };
 
diff --git a/generator/parser/binder.cpp b/generator/parser/binder.cpp
@@ -420,6 +420,12 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
       //          << qPrintable(name_cc.name()) << std::endl;
       return;
     }
+    if (p.packedParameter) {
+      //warnHere();
+      //std::cerr << "** Skipping function with packed parameter: "
+      //          << qPrintable(name_cc.name()) << std::endl;
+      return;
+    }
   }
 
   Q_ASSERT(! decl_cc.id().isEmpty());
diff --git a/generator/parser/declarator_compiler.cpp b/generator/parser/declarator_compiler.cpp
@@ -64,6 +64,7 @@ void DeclaratorCompiler::run(DeclaratorAST *node)
   _M_reference = false;
   _M_rvalue_reference = false;
   _M_variadics = false;
+  _M_packed_parameter = false;
   _M_indirection = 0;
 
   if (node)
@@ -81,6 +82,7 @@ void DeclaratorCompiler::run(DeclaratorAST *node)
       _M_function = (node->parameter_declaration_clause != 0);
       if (node->parameter_declaration_clause && node->parameter_declaration_clause->ellipsis)
         _M_variadics = true;
+      _M_packed_parameter = node->packedParameter;
 
       visitNodes(this, node->ptr_ops);
       visit(node->parameter_declaration_clause);
@@ -151,6 +153,7 @@ void DeclaratorCompiler::visitParameterDeclaration(ParameterDeclarationAST *node
 
   p.name = decl_cc.id();
   p.type = CompilerUtils::typeDescription(node->type_specifier, node->declarator, _M_binder);
+  p.packedParameter = decl_cc.isPackedParameter();
 
   // ignore case a single void parameter
   if (_M_parameters.isEmpty() && p.name.isEmpty() && p.type.toString() == "void")
diff --git a/generator/parser/declarator_compiler.h b/generator/parser/declarator_compiler.h
@@ -60,9 +60,10 @@ class DeclaratorCompiler: protected DefaultVisitor
     TypeInfo type;
     QString name;
     QString defaultValueExpression;
-    bool defaultValue;
+    bool defaultValue{};
+    bool packedParameter{};
 
-    Parameter(): defaultValue(false) {}
+    Parameter() {}
   };
 
 public:
@@ -76,6 +77,7 @@ class DeclaratorCompiler: protected DefaultVisitor
   inline bool isVariadics() const { return _M_variadics; }
   inline bool isReference() const { return _M_reference; }
   inline bool isRvalueReference() const { return _M_rvalue_reference; }
+  inline bool isPackedParameter() const { return _M_packed_parameter; }
   inline int indirection() const { return _M_indirection; }
   inline QList<Parameter> parameters() const { return _M_parameters; }
 
@@ -91,6 +93,7 @@ class DeclaratorCompiler: protected DefaultVisitor
   bool _M_reference;
   bool _M_rvalue_reference;
   bool _M_variadics;
+  bool _M_packed_parameter;
   int _M_indirection;
   QString _M_id;
   QStringList _M_array;
diff --git a/generator/parser/parser.cpp b/generator/parser/parser.cpp
@@ -1273,7 +1273,7 @@ bool Parser::parseTypeSpecifier(TypeSpecifierAST *&node)
   return true;
 }
 
-bool Parser::parseDeclarator(DeclaratorAST *&node)
+bool Parser::parseDeclarator(DeclaratorAST *&node, bool asParameter)
 {
   std::size_t start = token_stream.cursor();
 
@@ -1305,14 +1305,23 @@ bool Parser::parseDeclarator(DeclaratorAST *&node)
         {
           // unnamed bitfield
         }
-      else if (parseName(declId, true))
-        {
-          ast->id = declId;
-        }
       else
         {
-          rewind(start);
-          return false;
+          if (asParameter && token_stream.lookAhead() == Token_ellipsis)
+            {
+              // parameter pack
+              nextToken();
+              ast->packedParameter = true;
+            }
+          if (parseName(declId, true))
+            {
+              ast->id = declId;
+            }
+          else
+            {
+              rewind(start);
+              return false;
+            }
         }
 
       if (token_stream.lookAhead() == ':')
@@ -1902,7 +1911,7 @@ bool Parser::parseParameterDeclaration(ParameterDeclarationAST *&node)
   int index = (int) token_stream.cursor();
 
   DeclaratorAST *decl = 0;
-  if (!parseDeclarator(decl))
+  if (!parseDeclarator(decl, /*asParameter=*/true))
     {
       rewind(index);
 
diff --git a/generator/parser/parser.h b/generator/parser/parser.h
@@ -93,7 +93,7 @@ class Parser
   bool parseDeclaration(DeclarationAST *&node);
   bool parseDeclarationInternal(DeclarationAST *&node);
   bool parseDeclarationStatement(StatementAST *&node);
-  bool parseDeclarator(DeclaratorAST *&node);
+  bool parseDeclarator(DeclaratorAST *&node, bool asParameter = false);
   bool parseDeclaratorParametersAndSuffix(DeclaratorAST* node);
   bool parseDeleteExpression(ExpressionAST *&node);
   bool parseDoStatement(StatementAST *&node);

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,12 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)`
`420`	`420`	`// << qPrintable(name_cc.name()) << std::endl;`
`421`	`421`	`return;`
`422`	`422`	`}`
	`423`	`+ if (p.packedParameter) {`
	`424`	`+ //warnHere();`
	`425`	`+ //std::cerr << "** Skipping function with packed parameter: "`
	`426`	`+ // << qPrintable(name_cc.name()) << std::endl;`
	`427`	`+ return;`
	`428`	`+ }`
`423`	`429`	`}`
`424`	`430`
`425`	`431`	`Q_ASSERT(! decl_cc.id().isEmpty());`