Remove "is x among y" syntax for codeunits

livecodefraser · livecodefraser · commit 19bc1a959428 · 2016-09-08T16:26:53.000+01:00
This overload was ambiguous and could never be called because the chars
form was always chosen instead.
diff --git a/libscript/src/codeunit.lcb b/libscript/src/codeunit.lcb
@@ -29,8 +29,6 @@ public foreign handler MCCodeunitStoreCodeunitRangeOf(in Value as String, in Sta
 
 public foreign handler MCCodeunitEvalNumberOfCodeunitsIn(in Target as String, out Count as LCUIndex) returns nothing binds to "<builtin>"
 
-public foreign handler MCCodeunitEvalIsAmongTheCodeunitsOf(in Needle as String, in Target as String, out Value as CBool) returns nothing binds to "<builtin>"
-
 public foreign handler MCCodeunitStoreBeforeCodeunitOf(in Value as String, in Index as LCIndex, inout Target as String) returns nothing binds to "<builtin>"
 public foreign handler MCCodeunitStoreAfterCodeunitOf(in Value as String, in Index as LCIndex, inout Target as String) returns nothing binds to "<builtin>"
 
@@ -42,7 +40,7 @@ public foreign handler MCCodeunitEvalContains(in Source as String, in Needle as
 public foreign handler MCCodeunitEvalBeginsWith(in Source as String, in Prefix as String, out Result as CBool) returns nothing binds to "<builtin>"
 public foreign handler MCCodeunitEvalEndsWith(in Source as String, in Suffix as String, out Result as CBool) returns nothing binds to "<builtin>"
 
-public foreign handler MCCodeunitRepeatForEachCodeunit(inout Iterator as optional Pointer, inout Iterand as String, in Container as String) returns CBool binds to "<builtin>"
+public foreign handler MCCodeunitRepeatForEachCodeunit(inout Iterator as optional Pointer, inout Iterand as optional String, in Container as String) returns CBool binds to "<builtin>"
 
 public foreign handler MCCodeunitFetchFirstCodeunitOf(in Target as String, out Value as String) returns nothing binds to "<builtin>"
 public foreign handler MCCodeunitStoreFirstCodeunitOf(in Value as String, inout Target as String) returns nothing binds to "<builtin>"
@@ -294,27 +292,6 @@ end syntax
 
 --
 
-/**
-Summary:            Determines whether <Needle> is in <Target>.
-Needle: 			An expression which evaluates to a codeunit.
-Target: 			An expression which evaluates to a string.
-
-Returns: 	True if <Needle> is among the codeunits of <Target>, and false otherwise.
-
-Description:
->*Note:* It is an error if <Needle> evaluates to a string consisting of more than one codeunit.
-
-Tags: Strings
-*/
-
-syntax CodeunitIsInString is neutral binary operator with comparison precedence
-    <Needle: Expression> "is" "in" <Source: Expression>
-begin
-    MCCodeunitEvalIsAmongTheCodeunitsOf(Needle, Source, output)
-end syntax
-
---
-
 /**
 Summary:            Finds the first or last occurrence of <Needle> within <Target>
 
diff --git a/libscript/src/module-codeunit.cpp b/libscript/src/module-codeunit.cpp
@@ -23,19 +23,6 @@ extern "C" MC_DLLEXPORT_DEF void MCCodeunitEvalNumberOfCodeunitsIn(MCStringRef p
     r_output = MCStringGetLength(p_target);
 }
 
-extern "C" MC_DLLEXPORT_DEF void MCCodeunitEvalIsAmongTheCodeunitsOf(MCStringRef p_needle, MCStringRef p_target, bool& r_output)
-{
-    // Error if there is more than one char in needle.
-    if (MCStringGetLength(p_needle) != 1)
-    {
-        MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("needle must be a single char"), nil);
-        return;
-    }
-    
-    uindex_t t_dummy;
-    r_output = MCStringFirstIndexOfChar(p_target, MCStringGetCodepointAtIndex(p_needle, 0), 0, kMCStringOptionCompareExact, t_dummy);
-}
-
 extern "C" MC_DLLEXPORT_DEF void MCCodeunitFetchCodeunitRangeOf(index_t p_start, index_t p_finish, MCStringRef p_target, MCStringRef& r_output)
 {
     uindex_t t_start, t_count;
