Changeset: b14b2b312e2e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b14b2b312e2e Modified Files: monetdb5/modules/mal/calc.c sql/common/sql_types.c sql/server/rel_select.c Branch: clean_parser Log Message:
merged recursive cte diffs (truncated from 13691 to 300 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 @@ -282,7 +282,7 @@ bool GDKexiting(void); jmp_buf GDKfataljump; bit GDKfataljumpenable; str GDKfatalmsg; -char *GDKfilepath(int farmid, const char *dir, const char *nme, const char *ext); +gdk_return GDKfilepath(char *buf, size_t bufsize, int farmid, const char *dir, const char *nme, const char *ext) __attribute__((__access__(write_only, 1))); void GDKfree(void *blk); char *GDKgetbuf(void); unsigned GDKgetdebug(void); @@ -840,147 +840,147 @@ int UTF8_strwidth(const char *s); void addMalException(MalBlkPtr mb, str msg); str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name); str addPipeDefinition(Client cntxt, const char *name, const char *pipe); -const char *affectedRowsRef; -const char *aggrRef; -const char *alarmRef; -const char *algebraRef; -const char *alter_add_range_partitionRef; -const char *alter_add_tableRef; -const char *alter_add_value_partitionRef; -const char *alter_del_tableRef; -const char *alter_seqRef; -const char *alter_set_tableRef; -const char *alter_tableRef; -const char *alter_userRef; -const char *appendBulkRef; -const char *appendRef; -const char *assertRef; -const char *avgRef; -const char *bandjoinRef; +const char affectedRowsRef[]; +const char aggrRef[]; +const char alarmRef[]; +const char algebraRef[]; +const char alter_add_range_partitionRef[]; +const char alter_add_tableRef[]; +const char alter_add_value_partitionRef[]; +const char alter_del_tableRef[]; +const char alter_seqRef[]; +const char alter_set_tableRef[]; +const char alter_tableRef[]; +const char alter_userRef[]; +const char appendBulkRef[]; +const char appendRef[]; +const char assertRef[]; +const char avgRef[]; +const char bandjoinRef[]; void batAfterCall(ValPtr v, ValPtr bak); void batBeforeCall(ValPtr v, ValPtr bak); -const char *batRef; -const char *batalgebraRef; -const char *batcalcRef; -const char *batcapiRef; -const char *batmalRef; -const char *batmkeyRef; -const char *batmmathRef; -const char *batmtimeRef; -const char *batpyapi3Ref; -const char *batrapiRef; -const char *batsqlRef; -const char *batstrRef; +const char batRef[]; +const char batalgebraRef[]; +const char batcalcRef[]; +const char batcapiRef[]; +const char batmalRef[]; +const char batmkeyRef[]; +const char batmmathRef[]; +const char batmtimeRef[]; +const char batpyapi3Ref[]; +const char batrapiRef[]; +const char batsqlRef[]; +const char batstrRef[]; bool batstr_func_has_candidates(const char *func); -const char *bbpRef; -const char *betweenRef; -const char *bindRef; -const char *binddbatRef; -const char *bindidxRef; -const char *blockRef; -const char *bstreamRef; -const char *calcRef; +const char bbpRef[]; +const char betweenRef[]; +const char bindRef[]; +const char binddbatRef[]; +const char bindidxRef[]; +const char blockRef[]; +const char bstreamRef[]; +const char calcRef[]; str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[]); -const char *capiRef; +const char capiRef[]; str cfcnDefinition(Symbol s, str t, int flg, str base, size_t len); str chkDeclarations(MalBlkPtr mb); str chkFlow(MalBlkPtr mb); int chkInstruction(Module s, MalBlkPtr mb, InstrPtr p); str chkProgram(Module s, MalBlkPtr mb); str chkTypes(Module s, MalBlkPtr mb, int silent); -const char *claimRef; +const char claimRef[]; void clearTrace(Client cntxt); void clearVariable(MalBlkPtr mb, int varid); -const char *clear_tableRef; +const char clear_tableRef[]; int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); void clrInstruction(InstrPtr p); -const char *columnBindRef; -const char *comment_onRef; +const char columnBindRef[]; +const char comment_onRef[]; str compileString(Symbol *fcn, Client c, str s); -const char *compressRef; +const char compressRef[]; char *concatErrors(char *err1, const char *err2) __attribute__((__nonnull__(1, 2))) __attribute__((__returns_nonnull__)); -const char *connectRef; -const char *containsRef; +const char connectRef[]; +const char containsRef[]; str convertConstant(malType type, ValPtr vr); InstrPtr copyInstruction(const InstrRecord *p); InstrPtr copyInstructionArgs(const InstrRecord *p, int args); MalBlkPtr copyMalBlk(MalBlkPtr mb); -const char *copy_fromRef; -const char *corrRef; -const char *countRef; -const char *count_no_nilRef; +const char copy_fromRef[]; +const char corrRef[]; +const char countRef[]; +const char count_no_nilRef[]; int cpyConstant(MalBlkPtr mb, VarPtr vr); str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 3, 4))) __attribute__((__returns_nonnull__)); str createMalException(MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 4, 5))) __attribute__((__returns_nonnull__)); -const char *create_functionRef; -const char *create_roleRef; -const char *create_schemaRef; -const char *create_seqRef; -const char *create_tableRef; -const char *create_triggerRef; -const char *create_typeRef; -const char *create_userRef; -const char *create_viewRef; -const char *crossRef; -const char *cume_distRef; -const char *dataflowRef; -const char *dblRef; +const char create_functionRef[]; +const char create_roleRef[]; +const char create_schemaRef[]; +const char create_seqRef[]; +const char create_tableRef[]; +const char create_triggerRef[]; +const char create_typeRef[]; +const char create_userRef[]; +const char create_viewRef[]; +const char crossRef[]; +const char cume_distRef[]; +const char dataflowRef[]; +const char dblRef[]; void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); -const char *decompressRef; +const char decompressRef[]; int defConstant(MalBlkPtr mb, int type, ValPtr cst); -const char *defineRef; +const char defineRef[]; void delArgument(InstrPtr p, int varid); -const char *deleteRef; +const char deleteRef[]; void deleteSymbol(Module scope, Symbol prg); -const char *deltaRef; -const char *dense_rankRef; -const char *dependRef; -const char *deregisterRef; +const char deltaRef[]; +const char dense_rankRef[]; +const char dependRef[]; +const char deregisterRef[]; malType destinationType(MalBlkPtr mb, InstrPtr p); -const char *dictRef; -const char *diffRef; -const char *diffcandRef; -const char *differenceRef; -const char *disconnectRef; -const char *divRef; -const char *drop_constraintRef; -const char *drop_functionRef; -const char *drop_indexRef; -const char *drop_roleRef; -const char *drop_schemaRef; -const char *drop_seqRef; -const char *drop_tableRef; -const char *drop_triggerRef; -const char *drop_typeRef; -const char *drop_userRef; -const char *drop_viewRef; +const char dictRef[]; +const char diffRef[]; +const char diffcandRef[]; +const char differenceRef[]; +const char disconnectRef[]; +const char divRef[]; +const char drop_constraintRef[]; +const char drop_functionRef[]; +const char drop_indexRef[]; +const char drop_roleRef[]; +const char drop_schemaRef[]; +const char drop_seqRef[]; +const char drop_tableRef[]; +const char drop_triggerRef[]; +const char drop_typeRef[]; +const char drop_userRef[]; +const char drop_viewRef[]; void dumpModules(stream *out); -const char *emptybindRef; -const char *emptybindidxRef; -const char *endsWithRef; -const char *eqRef; -const char *evalRef; -const char *execRef; -const char *exportOperationRef; -const char *export_bin_columnRef; -const char *export_tableRef; +const char emptybindRef[]; +const char emptybindidxRef[]; +const char endsWithRef[]; +const char eqRef[]; +const char evalRef[]; +const char execRef[]; +const char exportOperationRef[]; +const char export_bin_columnRef[]; +const char export_tableRef[]; str fcnDefinition(MalBlkPtr mb, InstrPtr p, str t, int flg, str base, size_t len); -const char *fetchRef; +const char fetchRef[]; int findGDKtype(int type); Module findModule(Module scope, const char *name); -const char *findRef; +const char findRef[]; Scenario findScenario(const char *nme); Symbol findSymbol(Module usermodule, const char *mod, const char *fcn); Symbol findSymbolInModule(Module v, const char *fcn); int findVariable(MalBlkPtr mb, const char *name); int findVariableLength(MalBlkPtr mb, const char *name, int len); -const char *first_valueRef; -const char *firstnRef; +const char first_valueRef[]; +const char firstnRef[]; Module fixModule(const char *nme); int fndConstant(MalBlkPtr mb, const ValRecord *cst, int depth); -const char *forRef; +const char forRef[]; void freeException(str); void freeInstruction(InstrPtr p); void freeMalBlk(MalBlkPtr mb); @@ -992,7 +992,7 @@ void freeSymbolList(Symbol s); void freeVariable(MalBlkPtr mb, int varid); void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag); void garbageElement(Client cntxt, ValPtr v); -const char *generatorRef; +const char generatorRef[]; MALfcn getAddress(const char *modname, const char *fcnname); str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx); ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k); @@ -1019,56 +1019,56 @@ const char *getNameLen(const char *nme, int getOidConstant(MalBlkPtr mb, oid val); int getPC(MalBlkPtr mb, InstrPtr p); str getPipeCatalog(bat *nme, bat *def, bat *stat); -const char *getRef; +const char getRef[]; str getScenarioLanguage(Client c); int getShtConstant(MalBlkPtr mb, sht val); int getStrConstant(MalBlkPtr mb, str val); -const char *getTraceRef; +const char getTraceRef[]; str getTypeIdentifier(malType tpe); str getTypeName(malType tpe); char *getVarNameIntoBuffer(MalBlkPtr mb, int idx, char *buf); -const char *getVariableRef; +const char getVariableRef[]; Module globalModule(const char *nme); -const char *grantRef; -const char *grant_functionRef; -const char *grant_rolesRef; -const char *groupRef; -const char *groupbyRef; -const char *groupdoneRef; -const char *growRef; +const char grantRef[]; +const char grant_functionRef[]; +const char grant_rolesRef[]; +const char groupRef[]; +const char groupbyRef[]; +const char groupdoneRef[]; +const char growRef[]; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org