Changeset: 95207b197130 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95207b197130
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_type.h
Branch: default
Log Message:
Restore the Candidate list naming
All candidate lists can be recognized with C_ instead of X_
diffs (52 lines):
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -117,8 +117,7 @@ mal_export void mserver_reset(void);
#define VAR_CLEANUP 16
#define VAR_INIT 32
#define VAR_USED 64
-#define VAR_CLIST 128 /* Candidate list variable */
-#define VAR_DISABLED 256 /* used for comments and scheduler */
+#define VAR_DISABLED 128 /* used for comments and scheduler */
/* type check status is kept around to improve type checking efficiency */
#define TYPE_ERROR -1
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
@@ -763,7 +763,7 @@ newVariable(MalBlkPtr mb, str name, size
}
}
if( name == 0 || len == 0)
- (void) snprintf(mb->var[n]->id, IDLENGTH,"%c%c%d",
REFMARKER,TMPMARKER,mb->vid++);
+ (void) snprintf(mb->var[n]->id, IDLENGTH,"%c%c%d", REFMARKER,
TMPMARKER,mb->vid++);
else{
(void) strncpy( mb->var[n]->id, name,len);
mb->var[n]->id[len]=0;
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
@@ -84,9 +84,9 @@
#define setVarConstant(M,I) ((M)->var[I]->flags |= VAR_CONSTANT)
#define isVarConstant(M,I) ((M)->var[I]->flags & VAR_CONSTANT)
-#define clrVarCList(M,I) ((M)->var[I]->flags &= ~VAR_CLIST)
-#define setVarCList(M,I) ((M)->var[I]->flags |= VAR_CLIST)
-#define isVarCList(M,I) ((M)->var[I]->flags & VAR_CLIST)
+#define clrVarCList(M,I) ((M)->var[I]->id[0]= REFMARKER)
+#define setVarCList(M,I) ((M)->var[I]->id[0]= REFMARKERC)
+#define isVarCList(M,I) ((M)->var[I]->id[0] ==
REFMARKERC)
#define getVarConstant(M,I) ((M)->var[I]->value)
#define getVarValue(M,I) VALget(&(M)->var[I]->value)
diff --git a/monetdb5/mal/mal_type.h b/monetdb5/mal/mal_type.h
--- a/monetdb5/mal/mal_type.h
+++ b/monetdb5/mal/mal_type.h
@@ -16,7 +16,6 @@
#define TMPMARKER '_'
#define REFMARKER 'X'
#define REFMARKERC 'C'
-#define refMarker(M,I) (isVarCList(M,I)? 'C':'X')
#define newBatType(T) (1<<16 | (T & 0377) )
#define getBatType(X) ((X) & 0377 )
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
