Implement methods with lvalue/rvalue references, ...

usiems · mrbean-bremen · commit 690c1cccdb93 · 2023-11-24T14:21:06.000+01:00
also moved code into an own method to avoid some code duplication
diff --git a/generator/parser/ast.h b/generator/parser/ast.h
@@ -372,10 +372,9 @@ struct DeclarationStatementAST: public StatementAST
 struct DeclaratorAST: public AST
 {
   DECLARE_AST_NODE(Declarator)
+  enum ValueReferenceEnum { UnspecifiedRef, Lvalue, Rvalue }; // "&" or "&&" after member function
   
-  DeclaratorAST() {
-    _override = false;
-  }
+  DeclaratorAST() = default;
   const ListNode<PtrOperatorAST*> *ptr_ops{};
   DeclaratorAST *sub_declarator{};
   NameAST *id{};
@@ -385,6 +384,7 @@ struct DeclaratorAST: public AST
   const ListNode<std::size_t> *fun_cv{};
   ExceptionSpecificationAST *exception_spec{};
   bool _override{};
+  ValueReferenceEnum valueRef{ UnspecifiedRef };
 };
 
 struct DeleteExpressionAST: public ExpressionAST
diff --git a/generator/parser/binder.cpp b/generator/parser/binder.cpp
@@ -393,6 +393,13 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)
   }
   CodeModelFinder finder(model(), this);
 
+  if (declarator->valueRef == DeclaratorAST::Rvalue)
+  {
+    // rvalue reference methods are ignored, since we can't use them for the wrappers
+    // (there is usually also a method with lvalue reference binding)
+    return;
+  }
+
   ScopeModelItem functionScope = finder.resolveScope(declarator->id, scope);
   if (! functionScope)
     {
diff --git a/generator/parser/parser.cpp b/generator/parser/parser.cpp
@@ -1362,50 +1362,27 @@ bool Parser::parseDeclarator(DeclaratorAST *&node)
         return false;
       }
 
-    std::size_t index = token_stream.cursor();
-    if (token_stream.lookAhead() == '(')
+    if (parseDeclaratorParametersAndSuffix(ast)) {
+
+      if (token_stream.lookAhead() == Token_identifier &&
+        token_stream.symbol(token_stream.cursor())->as_string() == "override")
       {
         nextToken();
-
-        ParameterDeclarationClauseAST *params = 0;
-        if (!parseParameterDeclarationClause(params))
-          {
-            rewind(index);
-            goto update_pos;
-          }
-
-        ast->parameter_declaration_clause = params;
-
-        if (token_stream.lookAhead() != ')')
-          {
-            rewind(index);
-            goto update_pos;
-          }
-
-        nextToken();  // skip ')'
-
-        parseCvQualify(ast->fun_cv);
-        parseExceptionSpecification(ast->exception_spec);
-        if (token_stream.lookAhead() == Token_identifier) {
-          const NameSymbol *name_symbol = token_stream.symbol(token_stream.cursor());
-          QString name = name_symbol->as_string();
-          if (name == "override") {
-            nextToken();
-            ast->_override = true;
-          }
-        }
-        skipAttributes();
+        ast->_override = true;
       }
+      skipAttributes();
 
-    if (skipParen)
+      if (skipParen)
       {
         if (token_stream.lookAhead() != ')')
-          {
-            reportError(("')' expected"));
-          }
+        {
+          reportError(("')' expected"));
+        }
         else
           nextToken();
       }
+
+    }
   }
 
  update_pos:
@@ -1485,31 +1462,7 @@ bool Parser::parseAbstractDeclarator(DeclaratorAST *&node)
         return false;
       }
 
-    int index = (int) token_stream.cursor();
-    if (token_stream.lookAhead() == '(')
-      {
-        nextToken();
-
-        ParameterDeclarationClauseAST *params = 0;
-        if (!parseParameterDeclarationClause(params))
-          {
-            rewind(index);
-            goto update_pos;
-          }
-
-        ast->parameter_declaration_clause = params;
-
-        if (token_stream.lookAhead() != ')')
-          {
-            rewind(index);
-            goto update_pos;
-          }
-
-        nextToken();  // skip ')'
-
-        parseCvQualify(ast->fun_cv);
-        parseExceptionSpecification(ast->exception_spec);
-      }
+    parseDeclaratorParametersAndSuffix(ast);
   }
 
  update_pos:
@@ -1522,6 +1475,47 @@ bool Parser::parseAbstractDeclarator(DeclaratorAST *&node)
   return true;
 }
 
+bool Parser::parseDeclaratorParametersAndSuffix(DeclaratorAST* ast)
+{
+  std::size_t index = token_stream.cursor();
+  if (token_stream.lookAhead() == '(')
+  {
+    nextToken();
+
+    ParameterDeclarationClauseAST* params = 0;
+    if (!parseParameterDeclarationClause(params))
+    {
+      rewind(index);
+      return false;
+    }
+
+    ast->parameter_declaration_clause = params;
+
+    if (token_stream.lookAhead() != ')')
+    {
+      rewind(index);
+      return false;
+    }
+
+    nextToken();  // skip ')'
+
+    parseCvQualify(ast->fun_cv);
+    if (token_stream.lookAhead() == '&')
+    {
+      ast->valueRef = DeclaratorAST::Lvalue;
+      nextToken();
+    }
+    else if (token_stream.lookAhead() == Token_and)
+    {
+      ast->valueRef = DeclaratorAST::Rvalue;
+      nextToken();
+    }
+    parseExceptionSpecification(ast->exception_spec);
+    return true;
+  }
+  return false;
+}
+
 bool Parser::parseEnumSpecifier(TypeSpecifierAST *&node)
 {
   std::size_t start = token_stream.cursor();
diff --git a/generator/parser/parser.h b/generator/parser/parser.h
@@ -94,6 +94,7 @@ class Parser
   bool parseDeclarationInternal(DeclarationAST *&node);
   bool parseDeclarationStatement(StatementAST *&node);
   bool parseDeclarator(DeclaratorAST *&node);
+  bool parseDeclaratorParametersAndSuffix(DeclaratorAST* node);
   bool parseDeleteExpression(ExpressionAST *&node);
   bool parseDoStatement(StatementAST *&node);
   bool parseElaboratedTypeSpecifier(TypeSpecifierAST *&node);

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,13 @@ void Binder::visitFunctionDefinition(FunctionDefinitionAST *node)`
`393`	`393`	`}`
`394`	`394`	`CodeModelFinder finder(model(), this);`
`395`	`395`
	`396`	`+ if (declarator->valueRef == DeclaratorAST::Rvalue)`
	`397`	`+ {`
	`398`	`+ // rvalue reference methods are ignored, since we can't use them for the wrappers`
	`399`	`+ // (there is usually also a method with lvalue reference binding)`
	`400`	`+ return;`
	`401`	`+ }`
	`402`	`+`
`396`	`403`	`ScopeModelItem functionScope = finder.resolveScope(declarator->id, scope);`
`397`	`404`	`if (! functionScope)`
`398`	`405`	`{`