[ios, macos] Convert token strings to expressions on input

Removes mgl_expressionByReplacingTokensWithKeyPaths and associated code. Converting on output is no longer necessary: from the prior commit, core converts token strings to expressions at parse time; all that's necessary is to ensure that the runtime styling API does so as well.

1 files changed, 0 insertions, 41 deletions

diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm
index 01a279950b..5ae98e5244 100644
--- a/platform/darwin/test/MGLExpressionTests.mm
+++ b/platform/darwin/test/MGLExpressionTests.mm
@@ -995,47 +995,6 @@ using namespace std::string_literals;
 
 #pragma mark - Localization tests
 
-- (void)testTokenReplacement {
-    {
-        NSExpression *original = MGLConstantExpression(@"");
-        NSExpression *expected = original;
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-    {
-        NSExpression *original = MGLConstantExpression(@"{");
-        NSExpression *expected = original;
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-    {
-        NSExpression *original = MGLConstantExpression(@"{token");
-        NSExpression *expected = original;
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-    {
-        NSExpression *original = MGLConstantExpression(@"{token}");
-        NSExpression *expected = [NSExpression expressionForKeyPath:@"token"];
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-    {
-        NSExpression *original = MGLConstantExpression(@"{token} {token}");
-        NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_join({token, ' ', token})"];
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-    {
-        NSExpression *original = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($zoomLevel, '{short}', %@)", @{
-            @1: MGLConstantExpression(@"{short}"),
-            @2: @"…",
-            @3: @"{long}",
-        }];
-        NSExpression *expected = [NSExpression expressionWithFormat:@"mgl_step:from:stops:($zoomLevel, short, %@)", @{
-            @1: [NSExpression expressionForKeyPath:@"short"],
-            @2: @"…",
-            @3: [NSExpression expressionForKeyPath:@"long"],
-        }];
-        XCTAssertEqualObjects(original.mgl_expressionByReplacingTokensWithKeyPaths, expected);
-    }
-}
-
 - (void)testLocalization {
     {
         NSExpression *original = MGLConstantExpression(@"");