Detect geometry parsing errors

nicklockwood · nicklockwood · commit e9b00eaa6cfe · 2021-11-01T23:45:09.000Z
diff --git a/ShapeScript/EvaluationContext.swift b/ShapeScript/EvaluationContext.swift
@@ -282,6 +282,10 @@ extension EvaluationContext {
                     children.append(.mesh(geometry))
                     return
                 }
+            } catch let error as ImportError {
+                throw RuntimeErrorType.fileParsingError(
+                    for: path, at: url, message: error.message
+                )
             } catch {
                 let description = (error as NSError)
                     .userInfo[NSLocalizedDescriptionKey] as? String ?? "\(error)"
diff --git a/ShapeScript/Scene+SceneKit.swift b/ShapeScript/Scene+SceneKit.swift
@@ -238,19 +238,25 @@ public extension Material {
 }
 
 public extension Geometry {
-    convenience init(scnNode: SCNNode) {
-        var type = GeometryType.group
-        if let scnGeometry = scnNode.geometry, let mesh = Mesh(
-            scnGeometry, materialLookup: Material.init(scnMaterial:)
-        ) {
+    convenience init(scnNode: SCNNode) throws {
+        let type: GeometryType
+        if let scnGeometry = scnNode.geometry {
+            guard let mesh = Mesh(
+                scnGeometry,
+                materialLookup: Material.init(scnMaterial:)
+            ) else {
+                throw ImportError.unknownError
+            }
             type = .mesh(mesh)
+        } else {
+            type = .group
         }
         self.init(
             type: type,
             name: scnNode.name,
             transform: .transform(from: scnNode),
             material: .default,
-            children: scnNode.childNodes.map(Geometry.init(scnNode:)),
+            children: try scnNode.childNodes.map(Geometry.init(scnNode:)),
             sourceLocation: nil
         )
     }
diff --git a/Viewer/Document.swift b/Viewer/Document.swift
@@ -540,7 +540,7 @@ class Document: NSDocument, EvaluationDelegate {
             .createNormalsIfAbsent: true,
             .convertToYUp: true,
         ])
-        return Geometry(scnNode: scene.rootNode)
+        return try Geometry(scnNode: scene.rootNode)
     }
 
     func debugLog(_ values: [AnyHashable]) {

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ class Document: NSDocument, EvaluationDelegate {`
`540`	`540`	`.createNormalsIfAbsent: true,`
`541`	`541`	`.convertToYUp: true,`
`542`	`542`	`])`
`543`		`- return Geometry(scnNode: scene.rootNode)`
	`543`	`+ return try Geometry(scnNode: scene.rootNode)`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`func debugLog(_ values: [AnyHashable]) {`