Changeset: c104bd7dce34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c104bd7dce34
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
Branch: default
Log Message:
Removed function renameVariable, leaving behind an implementation suggestion.
diffs (48 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2456,7 +2456,6 @@ str remapRef;
str remoteRef;
void removeInstruction(MalBlkPtr mb, InstrPtr p);
void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
-void renameVariable(MalBlkPtr mb, int i, str pattern, int newid);
str rename_userRef;
str replaceRef;
str replicatorRef;
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -800,19 +800,6 @@ cloneVariable(MalBlkPtr tm, MalBlkPtr mb
return res;
}
-/* generate a new variable name based on a pattern with 1 %d argument*/
-void
-renameVariable(MalBlkPtr mb, int id, str pattern, int newid)
-{
- (void) mb;
- (void) id;
- (void) pattern;
- (void) newid;
- assert(0); /* unused, and unusable
*/
- assert(id >=0 && id <mb->vtop);
- /* snprintf(getVarName(mb,id),IDLENGTH,pattern,newid); */
-}
-
int
newTmpVariable(MalBlkPtr mb, malType type)
{
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -164,7 +164,9 @@ mal_export malType getType(MalBlkPtr mb,
mal_export str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
mal_export int newVariable(MalBlkPtr mb, const char *name, size_t len, malType
type);
mal_export int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid);
-mal_export void renameVariable(MalBlkPtr mb, int i, str pattern, int newid);
+/* generate a new variable name based on a pattern with 1 %d argument
+ * -- not used, but this is how to do it */
+/* #define renameVariable(mb, id, pattern, newid)
snprintf(getVarName(mb,id),IDLENGTH,pattern,newid) */
mal_export int newTmpVariable(MalBlkPtr mb, malType type);
mal_export int newTypeVariable(MalBlkPtr mb, malType type);
mal_export void freeVariable(MalBlkPtr mb, int varid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
