diff options
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 9 | ||||
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 38 |
2 files changed, 43 insertions, 4 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index 1a8dff060c..cb7f30f65a 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -1065,9 +1065,11 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { [expressionObject addObject:self.operand.mgl_jsonExpressionObject]; return expressionObject; } else if ([function isEqualToString:@"MGL_IF"] || + [function isEqualToString:@"MGL_IF:"] || [function isEqualToString:@"mgl_if:"]) { return self.mgl_jsonIfExpressionObject; } else if ([function isEqualToString:@"MGL_MATCH"] || + [function isEqualToString:@"MGL_MATCH:"] || [function isEqualToString:@"mgl_match:"]) { return self.mgl_jsonMatchExpressionObject; } else if ([function isEqualToString:@"mgl_coalesce:"] || @@ -1104,7 +1106,8 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } [NSException raise:NSInvalidArgumentException format:@"Casting expression to %@ not yet implemented.", type]; - } else if ([function isEqualToString:@"MGL_FUNCTION"]) { + } else if ([function isEqualToString:@"MGL_FUNCTION"] || + [function isEqualToString:@"MGL_FUNCTION:"]) { NSExpression *op = self.arguments.firstObject; if (op.expressionType == NSConstantValueExpressionType && [op.constantValue isEqualToString:@"collator"]) { @@ -1257,7 +1260,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } - (id)mgl_jsonMatchExpressionObject { - BOOL isAftermarketFunction = [self.function isEqualToString:@"MGL_MATCH"]; + BOOL isAftermarketFunction = [self.function hasPrefix:@"MGL_MATCH"]; NSUInteger minimumIndex = isAftermarketFunction ? 1 : 0; NSMutableArray *expressionObject = [NSMutableArray arrayWithObjects:@"match", (isAftermarketFunction ? self.arguments.firstObject : self.operand).mgl_jsonExpressionObject, nil]; @@ -1283,7 +1286,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } - (id)mgl_jsonIfExpressionObject { - BOOL isAftermarketFunction = [self.function isEqualToString:@"MGL_IF"]; + BOOL isAftermarketFunction = [self.function hasPrefix:@"MGL_IF"]; NSUInteger minimumIndex = isAftermarketFunction ? 1 : 0; NSExpression *firstCondition; id condition; diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index 6cb7bfdc3d..1b0630cef3 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -988,9 +988,45 @@ using namespace std::string_literals; NSArray *jsonExpression = @[@"random", @1, @2, @3, @4, @5]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); - expression = [NSExpression expressionWithFormat:@"MGL_FUNCTION('random', 1, 2, 3, 4)"]; + } + { + NSExpression *expression = [NSExpression expressionWithFormat:@"MGL_FUNCTION('random', 1, 2, 3, 4)"]; XCTAssertThrowsSpecificNamed([expression expressionValueWithObject:nil context:nil], NSException, NSInvalidArgumentException); } + { + NSArray *arguments = @[ + MGLConstantExpression(@"one"), MGLConstantExpression(@1), + [NSExpression expressionForVariable:@"one"], + ]; + NSExpression *nullaryExpression = [NSExpression expressionForFunction:@"MGL_LET" arguments:arguments]; + NSExpression *unaryExpression = [NSExpression expressionForFunction:@"MGL_LET:" arguments:arguments]; + XCTAssertEqualObjects(nullaryExpression.mgl_jsonExpressionObject, unaryExpression.mgl_jsonExpressionObject); + } + { + NSArray *arguments = @[ + [NSExpression expressionForVariable:@"x"], + MGLConstantExpression(@YES), MGLConstantExpression(@"yes"), + MGLConstantExpression(@NO), MGLConstantExpression(@"no"), + ]; + NSExpression *nullaryExpression = [NSExpression expressionForFunction:@"MGL_MATCH" arguments:arguments]; + NSExpression *unaryExpression = [NSExpression expressionForFunction:@"MGL_MATCH:" arguments:arguments]; + XCTAssertEqualObjects(nullaryExpression.mgl_jsonExpressionObject, unaryExpression.mgl_jsonExpressionObject); + } + { + NSArray *arguments = @[ + [NSPredicate predicateWithValue:YES], + MGLConstantExpression(@"yes"), MGLConstantExpression(@"no"), + ]; + NSExpression *nullaryExpression = [NSExpression expressionForFunction:@"MGL_IF" arguments:arguments]; + NSExpression *unaryExpression = [NSExpression expressionForFunction:@"MGL_IF:" arguments:arguments]; + XCTAssertEqualObjects(nullaryExpression.mgl_jsonExpressionObject, unaryExpression.mgl_jsonExpressionObject); + } + { + NSArray *arguments = @[MGLConstantExpression(@"zoom")]; + NSExpression *nullaryExpression = [NSExpression expressionForFunction:@"MGL_FUNCTION" arguments:arguments]; + NSExpression *unaryExpression = [NSExpression expressionForFunction:@"MGL_FUNCTION:" arguments:arguments]; + XCTAssertEqualObjects(nullaryExpression.mgl_jsonExpressionObject, unaryExpression.mgl_jsonExpressionObject); + } } #pragma mark - Localization tests |