Update for 1.6.2 release

Author: nicklockwood

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## [1.6.2](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.2) (2023-01-16)
+
+- Improved info panel display
+- Fixed twisted extrusion offset
+- Fixed roundrect detail level (previously 4x higher than intended)
+- Fixed incorrect output when intersecting groups of meshes
+- Empty scenes are no longer hidden if they contain debug geometry
+- Scene now conforms to Equatable protocol
+- Fixed misleading error message for excess color arguments
+- Fixed spurious forward declaration error for options that shadow global define
+- Added automatic casting of hex strings to color (useful for JSON data(
+- Made polygon members available on all geometries, not just manually-created meshes
+- Excluded source location from Geometry equality comparisons
+- Fixed vector member access on tuples containing string elements
+- Fixed vector member access on nested numeric tuples
+- Fixed color member access on tuples and strings
+- Fixed polygon member lookup on meshes
+- Fixed handling of blocks with optional children (e.g. polygon)
+- Improved symbol lookup performance
+- Bumped Euclid to version 0.6.8
+
 ## [1.6.1](https://github.com/nicklockwood/ShapeScript/releases/tag/1.6.1) (2023-01-02)
 
 - Added twist option to extrude command

ShapeScript.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "ShapeScript",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "license": {
     "type": "MIT",
     "file": "LICENSE.md"
@@ -10,7 +10,7 @@
   "authors": "Nick Lockwood",
   "source": {
     "git": "https://github.com/nicklockwood/ShapeScript.git",
-    "tag": "1.6.1"
+    "tag": "1.6.2"
   },
   "source_files": ["ShapeScript", "LRUCache/Sources", "SVGPath/Sources"],
   "requires_arc": true,

ShapeScript.xcodeproj/project.pbxproj

@@ -1131,7 +1131,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -1159,7 +1159,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = "ShapeScript Viewer";
@@ -1189,7 +1189,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = ShapeScript;
@@ -1221,7 +1221,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptViewer;
 				PRODUCT_MODULE_NAME = Viewer;
 				PRODUCT_NAME = ShapeScript;
@@ -1384,7 +1384,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;
@@ -1415,7 +1415,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.ShapeScriptLib;
 				PRODUCT_NAME = ShapeScript;
 				SKIP_INSTALL = YES;

ShapeScript/Interpreter.swift

@@ -11,7 +11,7 @@ import Foundation
 
 // MARK: Public interface
 
-public let version = "1.6.1"
+public let version = "1.6.2"
 
 public protocol EvaluationDelegate: AnyObject {
     func resolveURL(for path: String) -> URL
@@ -491,7 +491,7 @@ extension RuntimeErrorType {
 }
 
 private extension RuntimeError {
-    static let alternatives = [
+    static let alternatives: [String: [String]] = [
         "box": ["cube"],
         "rect": ["square"],
         "rectangle": ["square"],
@@ -525,11 +525,7 @@ private extension RuntimeError {
         "head": ["first"],
         "tail": ["last", "allButFirst"],
         "rest": ["allButFirst"],
-        "mod": ["%"],
-        "equals": ["="],
-        "eq": ["="],
-        "is": ["="],
-    ]
+    ].merging(ParserError.alternatives.mapValues { [$0] }) { $1 }
 
     static let osName: String = {
         #if os(macOS) || targetEnvironment(macCatalyst)

ShapeScript/Lexer.swift

@@ -160,8 +160,9 @@ public extension LexerError {
     var suggestion: String? {
         switch type {
         case let .unexpectedToken(string):
+            let options = InfixOperator.allCases.map { $0.rawValue }
             return Self.alternatives[string.lowercased()] ??
-                string.bestMatches(in: InfixOperator.allCases.map { $0.rawValue }).first
+                string.bestMatches(in: options).first
         case let .invalidEscapeSequence(string):
             return [
                 "\"\"": "\\\"",
@@ -246,7 +247,7 @@ public extension String {
 // MARK: Implementation
 
 private extension LexerError {
-    static let alternatives = [
+    static let alternatives: [String: String] = [
         "&&": "and",
         "&": "and",
         "||": "or",

ShapeScript/Parser.swift

@@ -63,7 +63,7 @@ public enum ExpressionType: Equatable {
     case color(Color)
     case identifier(String)
     case block(Identifier, Block)
-    indirect case tuple([Expression])
+    case tuple([Expression])
     indirect case prefix(PrefixOperator, Expression)
     indirect case infix(Expression, InfixOperator, Expression)
     indirect case member(Expression, Identifier)
@@ -126,7 +126,9 @@ public extension ParserError {
                 return nil
             }
             let options = InfixOperator.allCases.map { $0.rawValue }
-            return string.bestMatches(in: options).first
+
+            return Self.alternatives[string.lowercased()] ??
+                string.bestMatches(in: options).first
         case .unexpectedToken, .custom:
             return nil
         }
@@ -149,6 +151,15 @@ public extension ParserError {
 
 // MARK: Implementation
 
+extension ParserError {
+    static let alternatives: [String: String] = [
+        "mod": "%",
+        "equals": "=",
+        "eq": "=",
+        "is": "=",
+    ]
+}
+
 private extension TokenType {
     var errorDescription: String {
         switch self {

docs/1.6.2

@@ -0,0 +1 @@
+1.6.1