umbau exceptiomns

Jens-G · Nov 19, 2024 · 0372823 · 0372823
1 parent b4e51e1
commit 0372823
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 29 deletions.
diff --git a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
@@ -1658,8 +1658,10 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
   string exception_factory_class_name = normalize_clsnm(tstruct->get_name(), "", true) + "Factory";
   string exception_factory_intf_name = type_name(tstruct, false, false, true);
 
+  bool have_intf = false;
   if (is_exception && (!is_x_factory)) {
-    generate_delphi_struct_definition(out, tstruct, is_exception, is_result, true);
+    generate_delphi_struct_definition(out, tstruct, false, false, true);
+    have_intf = true;
   }
 
   if (is_exception) {
@@ -1675,15 +1677,13 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
   }
 
   string struct_intf_base_name;
-  if (is_x_factory) {
-    struct_intf_base_name = type_name(tstruct, false, true, false);
-  } else if(rtti_) {
+  if (rtti_) {
     struct_intf_base_name = "IBaseWithTypeInfo";
   } else {
     struct_intf_base_name = "IBase";
   }
 
-  if ((!is_exception) || is_x_factory || true) {
+  if (!have_intf) {
     generate_delphi_doc(out, tstruct);
     if(rtti_) {
       indent(out) << "{$TYPEINFO ON}" << '\n';
@@ -1694,34 +1694,30 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
 
     generate_guid(out);
 
-    if(is_x_factory) {
-      indent(out) << "function CreateException: " << type_name(tstruct, true, true) << ";" << '\n';
-    } else {
+    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+      generate_delphi_property_reader_definition(out, *m_iter, is_exception);
+      generate_delphi_property_writer_definition(out, *m_iter, is_exception);
+    }
+
+    if (members.size() > 0) {
+      out << '\n';
       for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        generate_delphi_property_reader_definition(out, *m_iter, is_exception);
-        generate_delphi_property_writer_definition(out, *m_iter, is_exception);
+        generate_property(out, *m_iter, true, is_exception);
       }
 
-      if (members.size() > 0) {
-        out << '\n';
-        for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-          generate_property(out, *m_iter, true, is_exception);
-        }
-
-        out << '\n';
-        for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-          if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-            generate_delphi_isset_reader_writer_definition(out, *m_iter, is_exception);
-          }
+      out << '\n';
+      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+        if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
+          generate_delphi_isset_reader_writer_definition(out, *m_iter, is_exception);
         }
+      }
 
-        out << '\n';
-        for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-          if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-            isset_name = prop_name(*m_iter, is_exception, "__isset_");
-            indent(out) << "property " << isset_name << ": System.Boolean read Get" << isset_name << " write Set" << isset_name << ";"
-                        << '\n';
-          }
+      out << '\n';
+      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+        if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
+          isset_name = prop_name(*m_iter, is_exception, "__isset_");
+          indent(out) << "property " << isset_name << ": System.Boolean read Get" << isset_name << " write Set" << isset_name << ";"
+                      << '\n';
         }
       }
     }
@@ -1734,6 +1730,15 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
       indent(out) << "{$IFNDEF TYPEINFO_WAS_ON} {$TYPEINFO OFF} {$ENDIF}" << '\n';
     }
     indent(out) << '\n';
+
+    if(is_x_factory) {
+      indent(out) << struct_intf_name << "Factory = interface(" << struct_intf_name << ')' << '\n';
+      indent_up();
+      generate_guid(out);
+      indent(out) << "function CreateException: " << type_name(tstruct, true, true) << ";" << '\n';
+      indent_down();
+      indent(out) << "end;" << '\n';
+    }
   }
 
   generate_delphi_doc(out, tstruct);
@@ -1753,6 +1758,7 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
   }  
   out << ")" << '\n';
 
+  /*
   if (is_exception && (!is_x_factory)) {
     indent(out) << "public" << '\n';
     indent_up();
@@ -1762,7 +1768,8 @@ void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
     indent_down();
     indent_down();
   }
-
+  */
+
   indent(out) << "private" << '\n';
   indent_up();
 

diff --git a/lib/delphi/test/serializer/Exceptions.thrift b/lib/delphi/test/serializer/Exceptions.thrift
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+exception Error {
+  1: i32 ErrorCode
+  2: Error InnerException
+}
+
+
+
+// EOF