Skip to content

Commit 1194e1f

Browse files
author
Fraser J. Gordon
committed
Remove un-necessary functions for row split/combine ops
1 parent 127cdb6 commit 1194e1f

3 files changed

Lines changed: 0 additions & 34 deletions

File tree

‎engine/src/cmdsm.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,8 +1207,6 @@ void MCArrayOp::exec_ctxt(MCExecContext &ctxt)
12071207
{
12081208
if (chunk == TYPE_COLUMN)
12091209
MCArraysExecCombineByColumn(ctxt, *t_array, &t_string);
1210-
else if (chunk == TYPE_ROW)
1211-
MCArraysExecCombineByColumn(ctxt, *t_array, &t_string);
12121210
else
12131211
MCArraysExecCombine(ctxt, *t_array, *t_element_del, *t_key_del, &t_string);
12141212
}
@@ -1229,8 +1227,6 @@ void MCArrayOp::exec_ctxt(MCExecContext &ctxt)
12291227
{
12301228
if (chunk == TYPE_COLUMN)
12311229
MCArraysExecSplitByColumn(ctxt, *t_string, &t_array);
1232-
else if (chunk == TYPE_ROW)
1233-
MCArraysExecSplitByRow(ctxt, *t_string, &t_array);
12341230
else
12351231
MCArraysExecSplit(ctxt, *t_string, *t_element_del, *t_key_del, &t_array);
12361232
}
@@ -1264,8 +1260,6 @@ void MCArrayOp::compile(MCSyntaxFactoryRef ctxt)
12641260
{
12651261
if (mode == TYPE_COLUMN)
12661262
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecCombineByColumnMethodInfo, 0, 0);
1267-
else if (mode == TYPE_ROW)
1268-
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecCombineByColumnMethodInfo, 0, 0);
12691263
else
12701264
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecCombineMethodInfo, 0, 1, 2, 0);
12711265
}
@@ -1278,8 +1272,6 @@ void MCArrayOp::compile(MCSyntaxFactoryRef ctxt)
12781272
{
12791273
if (mode == TYPE_COLUMN)
12801274
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecSplitByColumnMethodInfo, 0, 0);
1281-
else if (mode == TYPE_ROW)
1282-
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecSplitByRowMethodInfo, 0, 0);
12831275
else
12841276
MCSyntaxFactoryExecMethodWithArgs(ctxt, kMCArraysExecSplitMethodInfo, 0, 1, 2, 0);
12851277
}

‎engine/src/exec-array.cpp‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,6 @@ void MCArraysExecCombine(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef p_
151151
ctxt . Throw();
152152
}
153153

154-
void MCArraysExecCombineByRow(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string)
155-
{
156-
char_t t_row_char;
157-
t_row_char = ctxt . GetRowDelimiter();
158-
159-
MCAutoStringRef t_row_del;
160-
MCStringCreateWithNativeChars(&t_row_char, 1, &t_row_del);
161-
162-
MCArraysExecCombine(ctxt, p_array, *t_row_del, nil, r_string);
163-
}
164-
165154
void MCArraysExecCombineByColumn(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string)
166155
{
167156
ctxt . Unimplemented();
@@ -182,17 +171,6 @@ void MCArraysExecSplit(MCExecContext& ctxt, MCStringRef p_string, MCStringRef p_
182171
ctxt . Throw();
183172
}
184173

185-
void MCArraysExecSplitByRow(MCExecContext& ctxt, MCStringRef p_string, MCArrayRef& r_array)
186-
{
187-
char_t t_row_char;
188-
t_row_char = ctxt . GetRowDelimiter();
189-
190-
MCAutoStringRef t_row_del;
191-
MCStringCreateWithNativeChars(&t_row_char, 1, &t_row_del);
192-
193-
MCArraysExecSplit(ctxt, p_string, *t_row_del, nil, r_array);
194-
}
195-
196174
void MCArraysExecSplitByColumn(MCExecContext& ctxt, MCStringRef p_string, MCArrayRef& r_array)
197175
{
198176
ctxt . Unimplemented();

‎engine/src/exec.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,11 +1668,9 @@ void MCLogicEvalIsNotABoolean(MCExecContext& ctxt, MCValueRef p_value, bool& r_r
16681668
extern MCExecMethodInfo *kMCArraysEvalKeysMethodInfo;
16691669
extern MCExecMethodInfo *kMCArraysEvalExtentsMethodInfo;
16701670
extern MCExecMethodInfo *kMCArraysExecCombineMethodInfo;
1671-
extern MCExecMethodInfo *kMCArraysExecCombineByRowMethodInfo;
16721671
extern MCExecMethodInfo *kMCArraysExecCombineByColumnMethodInfo;
16731672
extern MCExecMethodInfo *kMCArraysExecCombineAsSetMethodInfo;
16741673
extern MCExecMethodInfo *kMCArraysExecSplitMethodInfo;
1675-
extern MCExecMethodInfo *kMCArraysExecSplitByRowMethodInfo;
16761674
extern MCExecMethodInfo *kMCArraysExecSplitByColumnMethodInfo;
16771675
extern MCExecMethodInfo *kMCArraysExecSplitAsSetMethodInfo;
16781676
extern MCExecMethodInfo *kMCArraysExecUnionMethodInfo;
@@ -1689,11 +1687,9 @@ extern MCExecMethodInfo *kMCArraysEvalIsNotAmongTheKeysOfMethodInfo;
16891687
void MCArraysEvalKeys(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string);
16901688
void MCArraysEvalExtents(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string);
16911689
void MCArraysExecCombine(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef p_element_delimiter, MCStringRef p_key_delimiter, MCStringRef& r_string);
1692-
void MCArraysExecCombineByRow(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string);
16931690
void MCArraysExecCombineByColumn(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef& r_string);
16941691
void MCArraysExecCombineAsSet(MCExecContext& ctxt, MCArrayRef p_array, MCStringRef p_element_delimiter, MCStringRef& r_string);
16951692
void MCArraysExecSplit(MCExecContext& ctxt, MCStringRef p_string, MCStringRef p_element_delimiter, MCStringRef p_key_delimiter, MCArrayRef& r_array);
1696-
void MCArraysExecSplitByRow(MCExecContext& ctxt, MCStringRef p_string, MCArrayRef& r_array);
16971693
void MCArraysExecSplitByColumn(MCExecContext& ctxt, MCStringRef p_string, MCArrayRef& r_array);
16981694
void MCArraysExecSplitAsSet(MCExecContext& ctxt, MCStringRef p_string, MCStringRef p_element_delimiter, MCArrayRef& r_array);
16991695
void MCArraysExecUnion(MCExecContext& ctxt, MCArrayRef x_dst_array, MCArrayRef p_src_array);

0 commit comments

Comments
 (0)