Assorted minor fixes and clean-ups (finos#894)

* Improve error handling in PureExecutionException.printPureStackTrace * Clean up ClassImplProcessor * Clean up TestRelationTypeInference * Fix a typo in AbstractCompiledStateIntegrityTest
aziemchawdhary-gs · Nov 15, 2024 · 7c859ba · 7c859ba
1 parent d8d70a1
commit 7c859ba
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 261 deletions.
diff --git a/...pure-m3-core/src/main/java/org/finos/legend/pure/m3/exception/PureExecutionException.java b/...pure-m3-core/src/main/java/org/finos/legend/pure/m3/exception/PureExecutionException.java
@@ -21,6 +21,7 @@
 import org.finos.legend.pure.m3.navigation.function.Function;
 import org.finos.legend.pure.m3.navigation.function.FunctionDescriptor;
 import org.finos.legend.pure.m3.navigation.function.FunctionType;
+import org.finos.legend.pure.m3.navigation.property.Property;
 import org.finos.legend.pure.m4.coreinstance.CoreInstance;
 import org.finos.legend.pure.m4.coreinstance.SourceInformation;
 import org.finos.legend.pure.m4.exception.PureException;
@@ -137,40 +138,39 @@ public <T extends Appendable> T printPureStackTrace(T appendable, String indent,
             this.callStack.toList().reverseForEach(x ->
             {
                 safeAppendable.append('\n').append(indent).append("    ");
-                CoreInstance func = x.getValueForMetaPropertyToOne(M3Properties.func);
-                if (func != null)
+                try
                 {
-                    if (processorSupport.instance_instanceOf(func, M3Paths.ConcreteFunctionDefinition) || processorSupport.instance_instanceOf(func, M3Paths.NativeFunction))
+                    CoreInstance func = x.getValueForMetaPropertyToOne(M3Properties.func);
+                    if (func == null)
                     {
-                        FunctionDescriptor.writeFunctionDescriptor(appendable, func, false, processorSupport);
+                        safeAppendable.append("NULL / TODO");
+                    }
+                    else if (processorSupport.instance_instanceOf(func, M3Paths.ConcreteFunctionDefinition) || processorSupport.instance_instanceOf(func, M3Paths.NativeFunction))
+                    {
+                        FunctionDescriptor.writeFunctionDescriptor(safeAppendable, func, false, processorSupport);
                     }
                     else if (processorSupport.instance_instanceOf(func, M3Paths.LambdaFunction))
                     {
-                        safeAppendable.append("Lambda ");
-                        FunctionType.print(appendable, Function.computeFunctionType(func, processorSupport), processorSupport);
+                        FunctionType.print(safeAppendable.append("Lambda "), Function.computeFunctionType(func, processorSupport), processorSupport);
                     }
-                    else if (processorSupport.instance_instanceOf(func, M3Paths.Property))
+                    else if (Property.isProperty(func, processorSupport))
                     {
-                        safeAppendable.append("Property ");
-                        safeAppendable.append(func.getValueForMetaPropertyToOne(M3Properties.name).getName());
-                        FunctionType.print(appendable, Function.computeFunctionType(func, processorSupport), processorSupport);
+                        safeAppendable.append("Property ").append(Property.getPropertyName(func));
+                        FunctionType.print(safeAppendable, Function.computeFunctionType(func, processorSupport), processorSupport);
                     }
                     else if (processorSupport.instance_instanceOf(func, M3Paths.Column))
                     {
-                        safeAppendable.append("Column ");
-                        safeAppendable.append(func.getValueForMetaPropertyToOne(M3Properties.name).getName());
-                        FunctionType.print(appendable, Function.computeFunctionType(func, processorSupport), processorSupport);
+                        safeAppendable.append("Column ").append(func.getValueForMetaPropertyToOne(M3Properties.name).getName());
+                        FunctionType.print(safeAppendable, Function.computeFunctionType(func, processorSupport), processorSupport);
                     }
                     else
                     {
-                        safeAppendable.append("Unknown Function Type '");
-                        safeAppendable.append(func.getClassifier().getName());
-                        safeAppendable.append("'");
+                        safeAppendable.append("Unknown Function Type '").append(func.getClassifier().getName()).append("'");
                     }
                 }
-                else
+                catch (Exception ignore)
                 {
-                    safeAppendable.append("NULL / TODO");
+                    safeAppendable.append("Error Printing Function");
                 }
                 writeSourceInformationMessage(safeAppendable.append("     <-     "), x.getSourceInformation(), false);
             });

diff --git a/...core/src/test/java/org/finos/legend/pure/m3/tests/AbstractCompiledStateIntegrityTest.java b/...core/src/test/java/org/finos/legend/pure/m3/tests/AbstractCompiledStateIntegrityTest.java
@@ -472,7 +472,7 @@ public void testPackagedElementsContainAllOthers()
                                     .forEach(classifierElementsPair ->
                                     {
                                         MutableList<CoreInstance> classifierElements = classifierElementsPair.getTwo();
-                                        builder.append("\n\t\t").append(sourceElementsPair.getOne()).append(" (").append(classifierElements.size()).append(')');
+                                        builder.append("\n\t\t").append(classifierElementsPair.getOne()).append(" (").append(classifierElements.size()).append(')');
                                         classifierElements.sortThisBy(CoreInstance::getSourceInformation).forEach(e ->
                                         {
                                             builder.append("\n\t\t\t").append(e);